svn commit: r828802 [1/2] - in /felix/trunk/karaf: ./ admin/ admin/command/ admin/command/src/ admin/command/src/main/ admin/command/src/main/java/ admin/command/src/main/java/org/ admin/command/src/main/java/org/apache/ admin/command/src/main/java/org...

[gn...@apache.org]

Author: gnodet
Date: Thu Oct 22 18:01:48 2009
New Revision: 828802

URL: http://svn.apache.org/viewvc?rev=828802&view=rev
Log:
FELIX-1766: Refactor and enable AdminServiceMBean

Added:
    felix/trunk/karaf/admin/
    felix/trunk/karaf/admin/command/
    felix/trunk/karaf/admin/command/NOTICE
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/NOTICE
    felix/trunk/karaf/admin/command/pom.xml
    felix/trunk/karaf/admin/command/src/
    felix/trunk/karaf/admin/command/src/main/
    felix/trunk/karaf/admin/command/src/main/java/
    felix/trunk/karaf/admin/command/src/main/java/org/
    felix/trunk/karaf/admin/command/src/main/java/org/apache/
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/AdminCommandSupport.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/AdminCommandSupport.java
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ChangePortCommand.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ChangePortCommand.java
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ConnectCommand.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ConnectCommand.java
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/CreateCommand.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommand.java
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/DestroyCommand.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/DestroyCommand.java
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ListCommand.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ListCommand.java
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/StartCommand.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StartCommand.java
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/StopCommand.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StopCommand.java
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/completers/
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/completers/InstanceCompleter.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/completers/InstanceCompleter.java
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/main/
    felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/main/Execute.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/main/Execute.java
    felix/trunk/karaf/admin/command/src/main/resources/
    felix/trunk/karaf/admin/command/src/main/resources/OSGI-INF/
    felix/trunk/karaf/admin/command/src/main/resources/OSGI-INF/blueprint/
    felix/trunk/karaf/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/OSGI-INF/blueprint/shell-admin.xml
    felix/trunk/karaf/admin/command/src/test/
    felix/trunk/karaf/admin/command/src/test/java/
    felix/trunk/karaf/admin/command/src/test/java/org/
    felix/trunk/karaf/admin/command/src/test/java/org/apache/
    felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/
    felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/
    felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/
    felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/command/
    felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/command/CreateCommandTest.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommandTest.java
    felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/main/
    felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/main/ExecuteTest.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/main/ExecuteTest.java
    felix/trunk/karaf/admin/core/
    felix/trunk/karaf/admin/core/NOTICE
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/NOTICE
    felix/trunk/karaf/admin/core/pom.xml
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/pom.xml
    felix/trunk/karaf/admin/core/src/
    felix/trunk/karaf/admin/core/src/main/
    felix/trunk/karaf/admin/core/src/main/java/
    felix/trunk/karaf/admin/core/src/main/java/org/
    felix/trunk/karaf/admin/core/src/main/java/org/apache/
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/AdminService.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminService.java
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/Instance.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/Instance.java
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/InstanceSettings.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/InstanceSettings.java
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/internal/
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/internal/AdminServiceImpl.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImpl.java
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/internal/InstanceImpl.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/InstanceImpl.java
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/Process.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/Process.java
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java
    felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java
    felix/trunk/karaf/admin/core/src/main/resources/
    felix/trunk/karaf/admin/core/src/main/resources/OSGI-INF/
    felix/trunk/karaf/admin/core/src/main/resources/OSGI-INF/blueprint/
    felix/trunk/karaf/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml
      - copied, changed from r828779, felix/trunk/karaf/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml
    felix/trunk/karaf/admin/core/src/main/resources/org/
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/karaf
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/karaf
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/karaf.bat
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/karaf.bat
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/start
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/start.bat
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start.bat
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/stop
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/stop.bat
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop.bat
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/org.apache.felix.karaf.shell.cfg
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.apache.felix.karaf.shell.cfg
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/org.ops4j.pax.url.mvn.cfg
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.ops4j.pax.url.mvn.cfg
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/system.properties
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/system.properties
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs
    felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs
    felix/trunk/karaf/admin/core/src/test/
    felix/trunk/karaf/admin/core/src/test/java/
    felix/trunk/karaf/admin/core/src/test/java/org/
    felix/trunk/karaf/admin/core/src/test/java/org/apache/
    felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/
    felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/
    felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/admin/
    felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/admin/InstanceSettingsTest.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/InstanceSettingsTest.java
    felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/admin/internal/
    felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/admin/internal/AdminServiceImplTest.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImplTest.java
    felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/jpm/
    felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/jpm/MainTest.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java
    felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java
    felix/trunk/karaf/admin/management/
    felix/trunk/karaf/admin/management/NOTICE
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/NOTICE
    felix/trunk/karaf/admin/management/pom.xml
    felix/trunk/karaf/admin/management/src/
    felix/trunk/karaf/admin/management/src/main/
    felix/trunk/karaf/admin/management/src/main/java/
    felix/trunk/karaf/admin/management/src/main/java/org/
    felix/trunk/karaf/admin/management/src/main/java/org/apache/
    felix/trunk/karaf/admin/management/src/main/java/org/apache/felix/
    felix/trunk/karaf/admin/management/src/main/java/org/apache/felix/karaf/
    felix/trunk/karaf/admin/management/src/main/java/org/apache/felix/karaf/admin/
    felix/trunk/karaf/admin/management/src/main/java/org/apache/felix/karaf/admin/management/
    felix/trunk/karaf/admin/management/src/main/java/org/apache/felix/karaf/admin/management/AdminServiceMBean.java
      - copied, changed from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminServiceMBean.java
    felix/trunk/karaf/admin/management/src/main/java/org/apache/felix/karaf/admin/management/codec/
    felix/trunk/karaf/admin/management/src/main/java/org/apache/felix/karaf/admin/management/codec/JmxInstance.java
    felix/trunk/karaf/admin/management/src/main/java/org/apache/felix/karaf/admin/management/internal/
    felix/trunk/karaf/admin/management/src/main/java/org/apache/felix/karaf/admin/management/internal/AdminServiceMBeanImpl.java
    felix/trunk/karaf/admin/management/src/main/java/org/apache/felix/karaf/admin/management/internal/MBeanRegistrer.java
    felix/trunk/karaf/admin/management/src/main/resources/
    felix/trunk/karaf/admin/management/src/main/resources/OSGI-INF/
    felix/trunk/karaf/admin/management/src/main/resources/OSGI-INF/blueprint/
    felix/trunk/karaf/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml
    felix/trunk/karaf/admin/management/src/test/
    felix/trunk/karaf/admin/management/src/test/java/
    felix/trunk/karaf/admin/management/src/test/java/org/
    felix/trunk/karaf/admin/management/src/test/java/org/apache/
    felix/trunk/karaf/admin/management/src/test/java/org/apache/felix/
    felix/trunk/karaf/admin/management/src/test/java/org/apache/felix/karaf/
    felix/trunk/karaf/admin/management/src/test/java/org/apache/felix/karaf/admin/
    felix/trunk/karaf/admin/management/src/test/java/org/apache/felix/karaf/admin/management/
    felix/trunk/karaf/admin/management/src/test/java/org/apache/felix/karaf/admin/management/codec/
    felix/trunk/karaf/admin/management/src/test/java/org/apache/felix/karaf/admin/management/codec/JmxInstanceTest.java
    felix/trunk/karaf/admin/management/src/test/java/org/apache/felix/karaf/admin/management/internal/
    felix/trunk/karaf/admin/management/src/test/java/org/apache/felix/karaf/admin/management/internal/AdminServiceMBeanImplTest.java
    felix/trunk/karaf/admin/pom.xml
      - copied, changed from r828779, felix/trunk/karaf/shell/pom.xml
Removed:
    felix/trunk/karaf/shell/admin/NOTICE
    felix/trunk/karaf/shell/admin/pom.xml
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/Process.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminService.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminServiceMBean.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/Instance.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/InstanceSettings.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImpl.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceMBeanImpl.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/InstanceImpl.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/AdminCommandSupport.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ChangePortCommand.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ConnectCommand.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommand.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/DestroyCommand.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ListCommand.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StartCommand.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StopCommand.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/completers/InstanceCompleter.java
    felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/main/Execute.java
    felix/trunk/karaf/shell/admin/src/main/resources/OSGI-INF/blueprint/shell-admin.xml
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/karaf
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/karaf.bat
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start.bat
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop.bat
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.apache.felix.karaf.shell.cfg
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.ops4j.pax.url.mvn.cfg
    felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/system.properties
    felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java
    felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java
    felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/InstanceSettingsTest.java
    felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImplTest.java
    felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommandTest.java
    felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/main/ExecuteTest.java
Modified:
    felix/trunk/karaf/assembly/pom.xml
    felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
    felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml
    felix/trunk/karaf/assembly/src/main/filtered-resources/bin/admin
    felix/trunk/karaf/assembly/src/main/filtered-resources/bin/admin.bat
    felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties
    felix/trunk/karaf/pom.xml
    felix/trunk/karaf/shell/pom.xml
    felix/trunk/karaf/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml

Copied: felix/trunk/karaf/admin/command/NOTICE (from r828779, felix/trunk/karaf/shell/admin/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/NOTICE?p2=felix/trunk/karaf/admin/command/NOTICE&p1=felix/trunk/karaf/shell/admin/NOTICE&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Added: felix/trunk/karaf/admin/command/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/pom.xml?rev=828802&view=auto
==============================================================================
--- felix/trunk/karaf/admin/command/pom.xml (added)
+++ felix/trunk/karaf/admin/command/pom.xml Thu Oct 22 18:01:48 2009
@@ -0,0 +1,102 @@
+<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/maven-v4_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.felix.karaf.admin</groupId>
+        <artifactId>admin</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.felix.karaf.admin</groupId>
+    <artifactId>org.apache.felix.karaf.admin.command</artifactId>
+    <packaging>bundle</packaging>
+    <version>1.1.0-SNAPSHOT</version>
+    <name>Apache Felix Karaf :: Admin Command</name>
+
+    <properties>
+        <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix.karaf.admin</groupId>
+            <artifactId>org.apache.felix.karaf.admin.core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix.karaf.shell</groupId>
+            <artifactId>org.apache.felix.karaf.shell.console</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>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>${pom.artifactId}*;version=${pom.version}</Export-Package>
+                        <Import-Package>
+                            !${pom.artifactId}*,
+                            javax.management,
+                            javax.management.loading,
+                            org.osgi.service.command,
+                            org.apache.felix.gogo.commands,
+                            org.apache.felix.karaf.shell.console,
+                            *
+                        </Import-Package>
+                        <Private-Package>!*</Private-Package>
+                        <_versionpolicy>${bnd.version.policy}</_versionpolicy>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Copied: felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/AdminCommandSupport.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/AdminCommandSupport.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/AdminCommandSupport.java?p2=felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/AdminCommandSupport.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/AdminCommandSupport.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/AdminCommandSupport.java (original)
+++ felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/AdminCommandSupport.java Thu Oct 22 18:01:48 2009
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal.commands;
+package org.apache.felix.karaf.admin.command;
 
-import org.apache.felix.karaf.shell.admin.AdminService;
-import org.apache.felix.karaf.shell.admin.Instance;
+import org.apache.felix.karaf.admin.AdminService;
+import org.apache.felix.karaf.admin.Instance;
 import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
-import org.apache.felix.gogo.commands.Command;
 
 public abstract class AdminCommandSupport extends OsgiCommandSupport {
 

Copied: felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ChangePortCommand.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ChangePortCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ChangePortCommand.java?p2=felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ChangePortCommand.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ChangePortCommand.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ChangePortCommand.java (original)
+++ felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ChangePortCommand.java Thu Oct 22 18:01:48 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal.commands;
+package org.apache.felix.karaf.admin.command;
 
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;

Copied: felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ConnectCommand.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ConnectCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ConnectCommand.java?p2=felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ConnectCommand.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ConnectCommand.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ConnectCommand.java (original)
+++ felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ConnectCommand.java Thu Oct 22 18:01:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal.commands;
+package org.apache.felix.karaf.admin.command;
 
 import org.apache.felix.gogo.commands.Option;
 import org.apache.felix.gogo.commands.Argument;

Copied: felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/CreateCommand.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/CreateCommand.java?p2=felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/CreateCommand.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommand.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommand.java (original)
+++ felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/CreateCommand.java Thu Oct 22 18:01:48 2009
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal.commands;
+package org.apache.felix.karaf.admin.command;
 
 import java.util.List;
 
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 import org.apache.felix.gogo.commands.Option;
-import org.apache.felix.karaf.shell.admin.InstanceSettings;
+import org.apache.felix.karaf.admin.InstanceSettings;
 
 
 /**

Copied: felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/DestroyCommand.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/DestroyCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/DestroyCommand.java?p2=felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/DestroyCommand.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/DestroyCommand.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/DestroyCommand.java (original)
+++ felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/DestroyCommand.java Thu Oct 22 18:01:48 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal.commands;
+package org.apache.felix.karaf.admin.command;
 
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;

Copied: felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ListCommand.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ListCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ListCommand.java?p2=felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ListCommand.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ListCommand.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ListCommand.java (original)
+++ felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/ListCommand.java Thu Oct 22 18:01:48 2009
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal.commands;
+package org.apache.felix.karaf.admin.command;
 
 import org.apache.felix.gogo.commands.Option;
 import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.karaf.shell.admin.Instance;
+import org.apache.felix.karaf.admin.Instance;
 
 /**
  * List available instances

Copied: felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/StartCommand.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StartCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/StartCommand.java?p2=felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/StartCommand.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StartCommand.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StartCommand.java (original)
+++ felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/StartCommand.java Thu Oct 22 18:01:48 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal.commands;
+package org.apache.felix.karaf.admin.command;
 
 import org.apache.felix.gogo.commands.Option;
 import org.apache.felix.gogo.commands.Argument;

Copied: felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/StopCommand.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StopCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/StopCommand.java?p2=felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/StopCommand.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StopCommand.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StopCommand.java (original)
+++ felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/StopCommand.java Thu Oct 22 18:01:48 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal.commands;
+package org.apache.felix.karaf.admin.command;
 
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;

Copied: felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/completers/InstanceCompleter.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/completers/InstanceCompleter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/completers/InstanceCompleter.java?p2=felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/completers/InstanceCompleter.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/completers/InstanceCompleter.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/completers/InstanceCompleter.java (original)
+++ felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/command/completers/InstanceCompleter.java Thu Oct 22 18:01:48 2009
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal.completers;
+package org.apache.felix.karaf.admin.command.completers;
 
 import java.util.List;
 
-import org.apache.felix.karaf.shell.admin.AdminService;
-import org.apache.felix.karaf.shell.admin.Instance;
+import org.apache.felix.karaf.admin.AdminService;
+import org.apache.felix.karaf.admin.Instance;
 import org.apache.felix.karaf.shell.console.completer.StringsCompleter;
 import org.apache.felix.karaf.shell.console.Completer;
 

Copied: felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/main/Execute.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/main/Execute.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/main/Execute.java?p2=felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/main/Execute.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/main/Execute.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/main/Execute.java (original)
+++ felix/trunk/karaf/admin/command/src/main/java/org/apache/felix/karaf/admin/main/Execute.java Thu Oct 22 18:01:48 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.main;
+package org.apache.felix.karaf.admin.main;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -26,14 +26,14 @@
 import org.apache.felix.gogo.commands.Action;
 import org.apache.felix.gogo.commands.Command;
 import org.apache.felix.gogo.commands.basic.DefaultActionPreparator;
-import org.apache.felix.karaf.shell.admin.internal.AdminServiceImpl;
-import org.apache.felix.karaf.shell.admin.internal.commands.AdminCommandSupport;
-import org.apache.felix.karaf.shell.admin.internal.commands.CreateCommand;
-import org.apache.felix.karaf.shell.admin.internal.commands.DestroyCommand;
-import org.apache.felix.karaf.shell.admin.internal.commands.ListCommand;
-import org.apache.felix.karaf.shell.admin.internal.commands.StartCommand;
-import org.apache.felix.karaf.shell.admin.internal.commands.StopCommand;
-import org.apache.felix.karaf.shell.admin.internal.commands.ChangePortCommand;
+import org.apache.felix.karaf.admin.command.AdminCommandSupport;
+import org.apache.felix.karaf.admin.command.ChangePortCommand;
+import org.apache.felix.karaf.admin.command.CreateCommand;
+import org.apache.felix.karaf.admin.command.DestroyCommand;
+import org.apache.felix.karaf.admin.command.ListCommand;
+import org.apache.felix.karaf.admin.command.StartCommand;
+import org.apache.felix.karaf.admin.command.StopCommand;
+import org.apache.felix.karaf.admin.internal.AdminServiceImpl;
 import org.fusesource.jansi.AnsiConsole;
 
 public class Execute {
@@ -42,7 +42,7 @@
         CreateCommand.class,
         StartCommand.class,
         StopCommand.class,
-        DestroyCommand.class,  
+        DestroyCommand.class,
         ListCommand.class,
         ChangePortCommand.class};
     private static final Map<String, Class<?>> COMMANDS = new TreeMap<String, Class<?>>();

Copied: felix/trunk/karaf/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/OSGI-INF/blueprint/shell-admin.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml?p2=felix/trunk/karaf/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml&p1=felix/trunk/karaf/shell/admin/src/main/resources/OSGI-INF/blueprint/shell-admin.xml&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/resources/OSGI-INF/blueprint/shell-admin.xml (original)
+++ felix/trunk/karaf/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml Thu Oct 22 18:01:48 2009
@@ -23,12 +23,12 @@
 
     <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
         <command name="admin/create">
-            <action class="org.apache.felix.karaf.shell.admin.internal.commands.CreateCommand">
+            <action class="org.apache.felix.karaf.admin.command.CreateCommand">
                 <property name="adminService" ref="adminService" />
             </action>
         </command>
         <command name="admin/connect">
-            <action class="org.apache.felix.karaf.shell.admin.internal.commands.ConnectCommand">
+            <action class="org.apache.felix.karaf.admin.command.ConnectCommand">
                 <property name="adminService" ref="adminService" />
             </action>
             <completers>
@@ -37,12 +37,12 @@
             </completers>
         </command>
         <command name="admin/list">
-            <action class="org.apache.felix.karaf.shell.admin.internal.commands.ListCommand">
+            <action class="org.apache.felix.karaf.admin.command.ListCommand">
                 <property name="adminService" ref="adminService" />
             </action>
         </command>
         <command name="admin/start">
-            <action class="org.apache.felix.karaf.shell.admin.internal.commands.StartCommand">
+            <action class="org.apache.felix.karaf.admin.command.StartCommand">
                 <property name="adminService" ref="adminService" />
             </action>
             <completers>
@@ -51,7 +51,7 @@
             </completers>
         </command>
         <command name="admin/stop">
-            <action class="org.apache.felix.karaf.shell.admin.internal.commands.StopCommand">
+            <action class="org.apache.felix.karaf.admin.command.StopCommand">
                 <property name="adminService" ref="adminService" />
             </action>
             <completers>
@@ -60,7 +60,7 @@
             </completers>
         </command>
         <command name="admin/destroy">
-            <action class="org.apache.felix.karaf.shell.admin.internal.commands.DestroyCommand">
+            <action class="org.apache.felix.karaf.admin.command.DestroyCommand">
                 <property name="adminService" ref="adminService" />
             </action>
             <completers>
@@ -69,7 +69,7 @@
             </completers>
         </command>
         <command name="admin/change-port">
-            <action class="org.apache.felix.karaf.shell.admin.internal.commands.ChangePortCommand">
+            <action class="org.apache.felix.karaf.admin.command.ChangePortCommand">
                 <property name="adminService" ref="adminService" />
             </action>
             <completers>
@@ -79,17 +79,10 @@
         </command>
     </command-bundle>
 
-    <bean id="adminService" class="org.apache.felix.karaf.shell.admin.internal.AdminServiceImpl" init-method="init">
-        <property name="storageLocation" value="${karaf.home}/instances" />
-    </bean>
+    <reference id="adminService" interface="org.apache.felix.karaf.admin.AdminService" />
 
-    <bean id="instanceCompleter" class="org.apache.felix.karaf.shell.admin.internal.completers.InstanceCompleter">
+    <bean id="instanceCompleter" class="org.apache.felix.karaf.admin.command.completers.InstanceCompleter">
         <property name="adminService" ref="adminService" />
     </bean>
     
-    <service ref="adminService" interface="org.apache.felix.karaf.shell.admin.AdminService" />
-
-    <!-- Allow the use of system properties -->
-    <ext:property-placeholder />
-
 </blueprint>

Copied: felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/command/CreateCommandTest.java (from r828779, felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommandTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/command/CreateCommandTest.java?p2=felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/command/CreateCommandTest.java&p1=felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommandTest.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommandTest.java (original)
+++ felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/command/CreateCommandTest.java Thu Oct 22 18:01:48 2009
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal.commands;
+package org.apache.felix.karaf.admin.command;
 
 import java.util.Arrays;
 import java.util.Collections;
 
 import junit.framework.TestCase;
 
-import org.apache.felix.karaf.shell.admin.AdminService;
-import org.apache.felix.karaf.shell.admin.InstanceSettings;
+import org.apache.felix.karaf.admin.AdminService;
+import org.apache.felix.karaf.admin.InstanceSettings;
 import org.easymock.EasyMock;
 
 public class CreateCommandTest extends TestCase {
@@ -40,7 +40,7 @@
         
         EasyMock.verify(adminService); // check precondition
         EasyMock.reset(adminService);
-        InstanceSettings expectedIS = 
+        InstanceSettings expectedIS =
             new InstanceSettings(9941, "top", Collections.singletonList("http://something"), Arrays.asList("abc", "def"));
         EasyMock.expect(adminService.createInstance("myInstance", expectedIS)).andReturn(null);
         EasyMock.replay(adminService);

Copied: felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/main/ExecuteTest.java (from r828779, felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/main/ExecuteTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/main/ExecuteTest.java?p2=felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/main/ExecuteTest.java&p1=felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/main/ExecuteTest.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/main/ExecuteTest.java (original)
+++ felix/trunk/karaf/admin/command/src/test/java/org/apache/felix/karaf/admin/main/ExecuteTest.java Thu Oct 22 18:01:48 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.main;
+package org.apache.felix.karaf.admin.main;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -28,9 +28,9 @@
 
 import junit.framework.TestCase;
 
-import org.apache.felix.karaf.shell.admin.AdminService;
-import org.apache.felix.karaf.shell.admin.internal.AdminServiceImpl;
-import org.apache.felix.karaf.shell.admin.internal.commands.AdminCommandSupport;
+import org.apache.felix.karaf.admin.AdminService;
+import org.apache.felix.karaf.admin.command.AdminCommandSupport;
+import org.apache.felix.karaf.admin.internal.AdminServiceImpl;
 import org.easymock.IAnswer;
 import org.easymock.classextension.EasyMock;
 

Copied: felix/trunk/karaf/admin/core/NOTICE (from r828779, felix/trunk/karaf/shell/admin/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/NOTICE?p2=felix/trunk/karaf/admin/core/NOTICE&p1=felix/trunk/karaf/shell/admin/NOTICE&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/pom.xml (from r828779, felix/trunk/karaf/shell/admin/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/pom.xml?p2=felix/trunk/karaf/admin/core/pom.xml&p1=felix/trunk/karaf/shell/admin/pom.xml&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/pom.xml (original)
+++ felix/trunk/karaf/admin/core/pom.xml Thu Oct 22 18:01:48 2009
@@ -21,20 +21,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.felix.karaf.shell</groupId>
-        <artifactId>shell</artifactId>
+        <groupId>org.apache.felix.karaf.admin</groupId>
+        <artifactId>admin</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.felix.karaf.shell</groupId>
-    <artifactId>org.apache.felix.karaf.shell.admin</artifactId>
+    <groupId>org.apache.felix.karaf.admin</groupId>
+    <artifactId>org.apache.felix.karaf.admin.core</artifactId>
     <packaging>bundle</packaging>
     <version>1.1.0-SNAPSHOT</version>
-    <name>Apache Felix Karaf :: Shell Admin</name>
-
-    <description>
-        Provides administration commands
-    </description>
+    <name>Apache Felix Karaf :: Admin Core</name>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -42,11 +38,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix.karaf.shell</groupId>
-            <artifactId>org.apache.felix.karaf.shell.console</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
@@ -59,21 +50,38 @@
         </dependency>
 
         <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-api</artifactId>
-            <scope>test</scope>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.bundlerepository</artifactId>
         </dependency>
 
         <dependency>
+            <groupId>org.apache.felix.karaf.shell</groupId>
+            <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix.karaf.shell</groupId>
+            <artifactId>org.apache.felix.karaf.shell.obr</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>${easymock.version}</version>
+            <artifactId>easymock</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -86,15 +94,6 @@
                     <include>**/*</include>
                 </includes>
             </resource>
-            <!--
-            <resource>
-                <directory>${pom.basedir}/src/main/filtered-resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            -->
         </resources>
         <filters>
             <filter>target/filter.txt</filter>
@@ -145,7 +144,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${basedir}/target/classes/org/apache/felix/karaf/shell/admin/etc</outputDirectory>
+                            <outputDirectory>${basedir}/target/classes/org/apache/felix/karaf/admin/etc</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>../../assembly/src/main/distribution/text/etc/</directory>
@@ -170,7 +169,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${basedir}/target/classes/org/apache/felix/karaf/shell/admin/etc</outputDirectory>
+                            <outputDirectory>${basedir}/target/classes/org/apache/felix/karaf/admin/etc</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>../../assembly/src/main/filtered-resources/etc</directory>
@@ -184,29 +183,31 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>            
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>Main</mainClass>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
-                        <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>
+                            org.apache.felix.karaf.admin;version=${pom.version},
+                            org.apache.felix.karaf.jpm;version=${pom.version}
+                        </Export-Package>
                         <Import-Package>
-                            !${pom.artifactId}*,
+                            !org.apache.felix.karaf.admin,
+                            !org.apache.felix.karaf.jpm,
+                            javax.management,
+                            javax.management.loading,
                             org.osgi.service.command,
                             org.apache.felix.gogo.commands,
                             org.apache.felix.karaf.shell.console,
                             *
                         </Import-Package>
-                        <Private-Package>org.apache.felix.karaf.jpm.*</Private-Package>
+                        <Private-Package>
+                            org.apache.felix.karaf.admin.internal,
+                            org.apache.felix.karaf.jpm.impl
+                        </Private-Package>
                         <_versionpolicy>${bnd.version.policy}</_versionpolicy>
                     </instructions>
                 </configuration>

Copied: felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/AdminService.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminService.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/AdminService.java?p2=felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/AdminService.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminService.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminService.java (original)
+++ felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/AdminService.java Thu Oct 22 18:01:48 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin;
+package org.apache.felix.karaf.admin;
 
 public interface AdminService {
 

Copied: felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/Instance.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/Instance.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/Instance.java?p2=felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/Instance.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/Instance.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/Instance.java (original)
+++ felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/Instance.java Thu Oct 22 18:01:48 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin;
+package org.apache.felix.karaf.admin;
 
 public interface Instance {
 

Copied: felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/InstanceSettings.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/InstanceSettings.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/InstanceSettings.java?p2=felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/InstanceSettings.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/InstanceSettings.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/InstanceSettings.java (original)
+++ felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/InstanceSettings.java Thu Oct 22 18:01:48 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin;
+package org.apache.felix.karaf.admin;
 
 import java.util.List;
 

Copied: felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/internal/AdminServiceImpl.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/internal/AdminServiceImpl.java?p2=felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/internal/AdminServiceImpl.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImpl.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImpl.java (original)
+++ felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/internal/AdminServiceImpl.java Thu Oct 22 18:01:48 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal;
+package org.apache.felix.karaf.admin.internal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -29,9 +29,9 @@
 import java.util.Properties;
 import java.util.Scanner;
 
-import org.apache.felix.karaf.shell.admin.AdminService;
-import org.apache.felix.karaf.shell.admin.Instance;
-import org.apache.felix.karaf.shell.admin.InstanceSettings;
+import org.apache.felix.karaf.admin.AdminService;
+import org.apache.felix.karaf.admin.Instance;
+import org.apache.felix.karaf.admin.InstanceSettings;
 import org.fusesource.jansi.Ansi;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -227,7 +227,7 @@
         File outFile = new File(target, resource);
         if( !outFile.exists() ) {
             println(Ansi.ansi().a("Creating file: ").a(Ansi.Attribute.INTENSITY_BOLD).a(outFile.getPath()).a(Ansi.Attribute.RESET).toString());
-            InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/felix/karaf/shell/admin/" + resource);
+            InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/felix/karaf/admin/" + resource);
             try {
                 if( text ) {
                     // Read it line at a time so that we can use the platform line ending when we write it out.
@@ -267,7 +267,7 @@
         File outFile = new File(target, resource);
         if( !outFile.exists() ) {
             println(Ansi.ansi().a("Creating file: ").a(Ansi.Attribute.INTENSITY_BOLD).a(outFile.getPath()).a(Ansi.Attribute.RESET).toString());
-            InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/felix/karaf/shell/admin/" + resource);
+            InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/felix/karaf/admin/" + resource);
             try {
                 // Read it line at a time so that we can use the platform line ending when we write it out.
                 PrintStream out = new PrintStream(new FileOutputStream(outFile));

Copied: felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/internal/InstanceImpl.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/InstanceImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/internal/InstanceImpl.java?p2=felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/internal/InstanceImpl.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/InstanceImpl.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/InstanceImpl.java (original)
+++ felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/admin/internal/InstanceImpl.java Thu Oct 22 18:01:48 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal;
+package org.apache.felix.karaf.admin.internal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -26,7 +26,7 @@
 import java.net.Socket;
 import java.util.Properties;
 
-import org.apache.felix.karaf.shell.admin.Instance;
+import org.apache.felix.karaf.admin.Instance;
 import org.apache.felix.karaf.jpm.Process;
 import org.apache.felix.karaf.jpm.ProcessBuilderFactory;
 import org.apache.felix.karaf.jpm.impl.ScriptUtils;

Copied: felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/Process.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/Process.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/Process.java?p2=felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/Process.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/Process.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java?p2=felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java?p2=felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java (original)
+++ felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java Thu Oct 22 18:01:48 2009
@@ -16,6 +16,8 @@
  */
 package org.apache.felix.karaf.jpm;
 
+import java.lang.*;
+
 import org.apache.felix.karaf.jpm.impl.ProcessBuilderFactoryImpl;
 
 /**

Copied: felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java?p2=felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java?p2=felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java (original)
+++ felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java Thu Oct 22 18:01:48 2009
@@ -42,7 +42,7 @@
         return ProcessImpl.create(dir, command);
     }
 
-    public org.apache.felix.karaf.jpm.Process attach(int pid) throws IOException {
+    public Process attach(int pid) throws IOException {
         return ProcessImpl.attach(pid);
     }
 }

Copied: felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java?p2=felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java (original)
+++ felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java Thu Oct 22 18:01:48 2009
@@ -103,7 +103,7 @@
         return 0;
     }
 
-    public static org.apache.felix.karaf.jpm.Process create(File dir, String command) throws IOException {
+    public static Process create(File dir, String command) throws IOException {
         //File input = File.createTempFile("jpm.", ".input");
         //File output = File.createTempFile("jpm.", ".output");
         //File error = File.createTempFile("jpm.", ".error");

Copied: felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java (from r828779, felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java?p2=felix/trunk/karaf/admin/core/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java&p1=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml (from r828779, felix/trunk/karaf/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml?p2=felix/trunk/karaf/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml&p1=felix/trunk/karaf/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml (original)
+++ felix/trunk/karaf/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml Thu Oct 22 18:01:48 2009
@@ -18,19 +18,16 @@
 
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
+           xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
+           default-activation="lazy">
 
-    <reference id="adminService" interface="org.apache.felix.karaf.shell.admin.AdminService" />
-
-    <bean id="adminPlugin" class="org.apache.felix.karaf.webconsole.admin.AdminPlugin" init-method="start" destroy-method="stop">
-        <property name="adminService" ref="adminService" />
-        <property name="bundleContext" ref="blueprintBundleContext" />
+    <bean id="adminService" class="org.apache.felix.karaf.admin.internal.AdminServiceImpl" init-method="init">
+        <property name="storageLocation" value="${karaf.home}/instances" />
     </bean>
 
-    <service ref="adminPlugin" interface="javax.servlet.Servlet" >
-        <service-properties>
-            <entry key="felix.webconsole.label" value="admin"/>
-        </service-properties>
-    </service>
+    <service ref="adminService" interface="org.apache.felix.karaf.admin.AdminService" />
+
+    <!-- Allow the use of system properties -->
+    <ext:property-placeholder />
 
 </blueprint>

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/karaf (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/karaf)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/karaf?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/karaf&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/karaf&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/karaf.bat (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/karaf.bat)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/karaf.bat?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/karaf.bat&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/karaf.bat&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/start (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/start?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/start&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/start.bat (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start.bat)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/start.bat?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/start.bat&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start.bat&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/stop (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/stop?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/stop&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/stop.bat (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop.bat)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/stop.bat?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/bin/stop.bat&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop.bat&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/org.apache.felix.karaf.shell.cfg (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.apache.felix.karaf.shell.cfg)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/org.apache.felix.karaf.shell.cfg?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/org.apache.felix.karaf.shell.cfg&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.apache.felix.karaf.shell.cfg&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/org.ops4j.pax.url.mvn.cfg (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.ops4j.pax.url.mvn.cfg)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/org.ops4j.pax.url.mvn.cfg?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/org.ops4j.pax.url.mvn.cfg&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.ops4j.pax.url.mvn.cfg&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/system.properties (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/system.properties)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/system.properties?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/admin/etc/system.properties&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/system.properties&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs (from r828779, felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs?p2=felix/trunk/karaf/admin/core/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs&p1=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)

Copied: felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/admin/InstanceSettingsTest.java (from r828779, felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/InstanceSettingsTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/admin/InstanceSettingsTest.java?p2=felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/admin/InstanceSettingsTest.java&p1=felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/InstanceSettingsTest.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/InstanceSettingsTest.java (original)
+++ felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/admin/InstanceSettingsTest.java Thu Oct 22 18:01:48 2009
@@ -14,20 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin;
+package org.apache.felix.karaf.admin;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 import junit.framework.TestCase;
+import org.apache.felix.karaf.admin.InstanceSettings;
+import org.junit.Assert;
 
 public class InstanceSettingsTest extends TestCase {
     public void testInstanceSettings() {
-        InstanceSettings is = 
+        InstanceSettings is =
             new InstanceSettings(1, null, Collections.<String>emptyList(), Arrays.asList("hi"));
         assertEquals(1, is.getPort());
-        assertNull(is.getLocation());
+        Assert.assertNull(is.getLocation());
         assertEquals(Arrays.asList("hi"), is.getFeatures());
         assertEquals(0, is.getFeatureURLs().size());
     }
@@ -46,8 +48,8 @@
     
     public void testEqualsHashCode2() {
         InstanceSettings is = new InstanceSettings(1, "top", Collections.<String>emptyList(), Arrays.asList("hi"));
-        assertFalse(is.equals(null));
-        assertFalse(is.equals(new Object()));
+        Assert.assertFalse(is.equals(null));
+        Assert.assertFalse(is.equals(new Object()));
         assertEquals(is, is);
     }
 }

Copied: felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/admin/internal/AdminServiceImplTest.java (from r828779, felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImplTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/admin/internal/AdminServiceImplTest.java?p2=felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/admin/internal/AdminServiceImplTest.java&p1=felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImplTest.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImplTest.java (original)
+++ felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/admin/internal/AdminServiceImplTest.java Thu Oct 22 18:01:48 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.karaf.shell.admin.internal;
+package org.apache.felix.karaf.admin.internal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -26,7 +26,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.felix.karaf.shell.admin.InstanceSettings;
+import org.apache.felix.karaf.admin.InstanceSettings;
 
 public class AdminServiceImplTest extends TestCase {
     public void testHandleFeatures() throws Exception {

Copied: felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/jpm/MainTest.java (from r828779, felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/jpm/MainTest.java?p2=felix/trunk/karaf/admin/core/src/test/java/org/apache/felix/karaf/jpm/MainTest.java&p1=felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java&r1=828779&r2=828802&rev=828802&view=diff
==============================================================================
    (empty)