You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/02/20 11:14:58 UTC
svn commit: r1291178 [1/3] - in /karaf/trunk: ./ admin/ admin/command/
admin/command/src/main/java/org/apache/karaf/admin/command/
admin/command/src/main/java/org/apache/karaf/admin/command/completers/
admin/command/src/main/java/org/apache/karaf/admin...
Author: jbonofre
Date: Mon Feb 20 10:14:50 2012
New Revision: 1291178
URL: http://svn.apache.org/viewvc?rev=1291178&view=rev
Log:
[KARAF-947] Rename admin service to instance service
Added:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
- copied, changed from r1291022, karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/admin
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat
- copied, changed from r1291022, karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/admin.bat
karaf/trunk/instance/
karaf/trunk/instance/command/
karaf/trunk/instance/command/NOTICE
- copied, changed from r1291022, karaf/trunk/admin/command/NOTICE
karaf/trunk/instance/command/pom.xml
- copied, changed from r1291022, karaf/trunk/admin/command/pom.xml
karaf/trunk/instance/command/src/
karaf/trunk/instance/command/src/main/
karaf/trunk/instance/command/src/main/java/
karaf/trunk/instance/command/src/main/java/org/
karaf/trunk/instance/command/src/main/java/org/apache/
karaf/trunk/instance/command/src/main/java/org/apache/karaf/
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeOptsCommand.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeOptsCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiRegistryPortCommand.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeRmiRegistryPortCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiServerPortCommand.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeRmiServerPortCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeSshPortCommand.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeSshPortCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ConnectCommand.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ConnectCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/CreateCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/DestroyCommand.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/DestroyCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/InstanceCommandSupport.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/AdminCommandSupport.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ListCommand.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/RenameCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/StartCommand.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StartCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/StopCommand.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StopCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/completers/
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/completers/InstanceCompleter.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/completers/InstanceCompleter.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/main/
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/main/Execute.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java
karaf/trunk/instance/command/src/main/resources/
karaf/trunk/instance/command/src/main/resources/OSGI-INF/
karaf/trunk/instance/command/src/main/resources/OSGI-INF/blueprint/
karaf/trunk/instance/command/src/main/resources/OSGI-INF/blueprint/instance-command.xml
- copied, changed from r1291022, karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml
karaf/trunk/instance/command/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/instance/command/src/test/
karaf/trunk/instance/command/src/test/java/
karaf/trunk/instance/command/src/test/java/org/
karaf/trunk/instance/command/src/test/java/org/apache/
karaf/trunk/instance/command/src/test/java/org/apache/karaf/
karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/
karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/command/
karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/test/java/org/apache/karaf/admin/command/CreateCommandTest.java
karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/main/
karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/main/ExecuteTest.java
- copied, changed from r1291022, karaf/trunk/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java
karaf/trunk/instance/core/
karaf/trunk/instance/core/NOTICE
- copied, changed from r1291022, karaf/trunk/admin/core/NOTICE
karaf/trunk/instance/core/pom.xml
- copied, changed from r1291022, karaf/trunk/admin/core/pom.xml
karaf/trunk/instance/core/src/
karaf/trunk/instance/core/src/main/
karaf/trunk/instance/core/src/main/java/
karaf/trunk/instance/core/src/main/java/org/
karaf/trunk/instance/core/src/main/java/org/apache/
karaf/trunk/instance/core/src/main/java/org/apache/karaf/
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/Instance.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/Instance.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceService.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/AdminService.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceSettings.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/InstanceSettings.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceImpl.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceServiceImpl.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/Process.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/Process.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java
karaf/trunk/instance/core/src/main/resources/
karaf/trunk/instance/core/src/main/resources/OSGI-INF/
karaf/trunk/instance/core/src/main/resources/OSGI-INF/blueprint/
karaf/trunk/instance/core/src/main/resources/OSGI-INF/blueprint/instance-core.xml
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml
karaf/trunk/instance/core/src/main/resources/OSGI-INF/bundle.info
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/instance/core/src/main/resources/org/
karaf/trunk/instance/core/src/main/resources/org/apache/
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf.bat
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf.bat
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start.bat
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start.bat
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop.bat
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop.bat
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.management.cfg
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.shell.cfg
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.url.mvn.cfg
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/system.properties
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/unix/
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/unix/start.sh
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/unix/start.sh
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/destroy.vbs
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/windows/destroy.vbs
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/running.vbs
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/windows/running.vbs
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/start.vbs
- copied, changed from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/windows/start.vbs
karaf/trunk/instance/core/src/test/
karaf/trunk/instance/core/src/test/java/
karaf/trunk/instance/core/src/test/java/org/
karaf/trunk/instance/core/src/test/java/org/apache/
karaf/trunk/instance/core/src/test/java/org/apache/karaf/
karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/
karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/InstanceSettingsTest.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/InstanceSettingsTest.java
karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/
karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java
karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/
karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/MainTest.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/MainTest.java
karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java
- copied, changed from r1291022, karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java
karaf/trunk/instance/core/src/test/resources/
karaf/trunk/instance/core/src/test/resources/etc/
karaf/trunk/instance/core/src/test/resources/etc/startup.properties
- copied, changed from r1291022, karaf/trunk/admin/core/src/test/resources/etc/startup.properties
karaf/trunk/instance/management/
karaf/trunk/instance/management/NOTICE
- copied, changed from r1291022, karaf/trunk/admin/management/NOTICE
karaf/trunk/instance/management/pom.xml
- copied, changed from r1291022, karaf/trunk/admin/management/pom.xml
karaf/trunk/instance/management/src/
karaf/trunk/instance/management/src/main/
karaf/trunk/instance/management/src/main/java/
karaf/trunk/instance/management/src/main/java/org/
karaf/trunk/instance/management/src/main/java/org/apache/
karaf/trunk/instance/management/src/main/java/org/apache/karaf/
karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/
karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/
karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/InstanceServiceMBean.java
- copied, changed from r1291022, karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java
karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/codec/
karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/codec/JmxInstance.java
- copied, changed from r1291022, karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/codec/JmxInstance.java
karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/internal/
karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImpl.java
- copied, changed from r1291022, karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java
karaf/trunk/instance/management/src/main/resources/
karaf/trunk/instance/management/src/main/resources/OSGI-INF/
karaf/trunk/instance/management/src/main/resources/OSGI-INF/blueprint/
karaf/trunk/instance/management/src/main/resources/OSGI-INF/blueprint/instance-management.xml
- copied, changed from r1291022, karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml
karaf/trunk/instance/management/src/main/resources/OSGI-INF/bundle.info
- copied, changed from r1291022, karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/instance/management/src/test/
karaf/trunk/instance/management/src/test/java/
karaf/trunk/instance/management/src/test/java/org/
karaf/trunk/instance/management/src/test/java/org/apache/
karaf/trunk/instance/management/src/test/java/org/apache/karaf/
karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/
karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/
karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/codec/
karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/codec/JmxInstanceTest.java
- copied, changed from r1291022, karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/codec/JmxInstanceTest.java
karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/internal/
karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImplTest.java
karaf/trunk/instance/pom.xml
- copied, changed from r1291022, karaf/trunk/admin/pom.xml
karaf/trunk/webconsole/instance/
karaf/trunk/webconsole/instance/NOTICE
- copied, changed from r1291022, karaf/trunk/webconsole/admin/NOTICE
karaf/trunk/webconsole/instance/pom.xml
- copied, changed from r1291022, karaf/trunk/webconsole/admin/pom.xml
karaf/trunk/webconsole/instance/src/
karaf/trunk/webconsole/instance/src/main/
karaf/trunk/webconsole/instance/src/main/java/
karaf/trunk/webconsole/instance/src/main/java/org/
karaf/trunk/webconsole/instance/src/main/java/org/apache/
karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/
karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/
karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/
karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java
- copied, changed from r1291022, karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java
karaf/trunk/webconsole/instance/src/main/resources/
karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/
karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/
karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml
- copied, changed from r1291022, karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml
karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/bundle.info
- copied, changed from r1291022, karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/webconsole/instance/src/main/resources/res/
karaf/trunk/webconsole/instance/src/main/resources/res/ui/
karaf/trunk/webconsole/instance/src/main/resources/res/ui/instance.js
- copied, changed from r1291022, karaf/trunk/webconsole/admin/src/main/resources/res/ui/admin.js
karaf/trunk/webconsole/instance/src/test/
karaf/trunk/webconsole/instance/src/test/java/
karaf/trunk/webconsole/instance/src/test/java/org/
karaf/trunk/webconsole/instance/src/test/java/org/apache/
karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/
karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/
karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/
karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java
- copied, changed from r1291022, karaf/trunk/webconsole/admin/src/test/java/org/apache/karaf/webconsole/admin/AdminPluginTest.java
Removed:
karaf/trunk/admin/command/NOTICE
karaf/trunk/admin/command/pom.xml
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/AdminCommandSupport.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeOptsCommand.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeRmiRegistryPortCommand.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeRmiServerPortCommand.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeSshPortCommand.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ConnectCommand.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/CreateCommand.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/DestroyCommand.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/RenameCommand.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StartCommand.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StopCommand.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/completers/InstanceCompleter.java
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java
karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml
karaf/trunk/admin/command/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/admin/command/src/test/java/org/apache/karaf/admin/command/CreateCommandTest.java
karaf/trunk/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java
karaf/trunk/admin/core/NOTICE
karaf/trunk/admin/core/pom.xml
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/AdminService.java
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/Instance.java
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/InstanceSettings.java
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java
karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/Process.java
karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java
karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java
karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java
karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java
karaf/trunk/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml
karaf/trunk/admin/core/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf.bat
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start.bat
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop.bat
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.management.cfg
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.shell.cfg
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/system.properties
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/unix/start.sh
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/windows/destroy.vbs
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/windows/running.vbs
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/windows/start.vbs
karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/InstanceSettingsTest.java
karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java
karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/MainTest.java
karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java
karaf/trunk/admin/core/src/test/resources/etc/startup.properties
karaf/trunk/admin/management/NOTICE
karaf/trunk/admin/management/pom.xml
karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java
karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/codec/JmxInstance.java
karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java
karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml
karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/codec/JmxInstanceTest.java
karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImplTest.java
karaf/trunk/admin/pom.xml
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/admin
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/admin.bat
karaf/trunk/webconsole/admin/NOTICE
karaf/trunk/webconsole/admin/pom.xml
karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java
karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml
karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/webconsole/admin/src/main/resources/res/ui/admin.js
karaf/trunk/webconsole/admin/src/test/java/org/apache/karaf/webconsole/admin/AdminPluginTest.java
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties
karaf/trunk/assemblies/features/standard/pom.xml
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java
karaf/trunk/itests/kittests/pom.xml
karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
karaf/trunk/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java
karaf/trunk/manual/pom.xml
karaf/trunk/pom.xml
karaf/trunk/region/commands/src/main/java/org/apache/karaf/region/commands/RegionCommandSupport.java
karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/BlueprintListener.java
karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/StartLevel.java
karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationCompleter.java
karaf/trunk/shell/dev/src/main/resources/org/apache/karaf/shell/dev/framework/equinox-debug.properties
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java
karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/NativeKarafFrameworkTest.java
karaf/trunk/webconsole/pom.xml
Copied: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance (from r1291022, karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/admin)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance?p2=karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance&p1=karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/admin&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/admin (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance Mon Feb 20 10:14:50 2012
@@ -22,7 +22,7 @@ PROGNAME=`basename "$0"`
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-export KARAF_SCRIPT="admin"
+export KARAF_SCRIPT="instance"
if [ -e "$DIRNAME/setenv" ]; then
. "$DIRNAME/setenv"
fi
@@ -314,7 +314,7 @@ init() {
run() {
- CLASSPATH=${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}/org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
+ CLASSPATH=${KARAF_HOME}/system/org/apache/karaf/instance/org.apache.karaf.instance.command/${project.version}/org.apache.karaf.instance.command-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/instance/org.apache.karaf.instance.core/${project.version}/org.apache.karaf.instance.core-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}/org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
if $cygwin; then
KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
@@ -322,7 +322,7 @@ run() {
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.admin.main.Execute "$@"
+ exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.instance.main.Execute "$@"
}
main() {
Copied: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat (from r1291022, karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/admin.bat)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat?p2=karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat&p1=karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/admin.bat&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/admin.bat (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat Mon Feb 20 10:14:50 2012
@@ -25,7 +25,7 @@ set PROGNAME=%~nx0%
set ARGS=%*
rem Sourcing environment settings for karaf similar to tomcats setenv
-SET KARAF_SCRIPT="admin.bat"
+SET KARAF_SCRIPT="instance.bat"
if exist "%DIRNAME%setenv.bat" (
call "%DIRNAME%setenv.bat"
)
@@ -111,13 +111,13 @@ if "%KARAF_DEBUG%" == "" goto :KARAF_DEB
call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
:KARAF_DEBUG_END
-set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\admin\org.apache.karaf.admin.command\${project.version}\org.apache.karaf.admin.command-${project.version}.jar;%KARAF_HOME%\system\org\apache\karaf\admin\org.apache.karaf.admin.core\${project.version}\org.apache.karaf.admin.core-${project.version}.jar;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.console\${project.version}\org.apache.karaf.shell.console-${project.version}.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.api\${aries.blueprint.api.version}\org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\${pax.logging.version}\pax-logging-api-${pax.logging.version}.jar;%KARAF_HOME%\system\org\apache\felix\org.apache.felix.framework\${felix.framework.version}\org.apache.felix.framework-${felix.framework.version}.jar
+set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.instance.command\${project.version}\org.apache.karaf.instance.command-${project.version}.jar;%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.instance.core\${project.version}\org.apache.karaf.instance.core-${project.version}.jar;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.console\${project.version}\org.apache.karaf.shell.console-${project.version}.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.api\${aries.blueprint.api.version}\org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\${pax.logging.version}\pax-logging-api-${pax.logging.version}.jar;%KARAF_HOME%\system\org\apache\felix\org.apache.felix.framework\${felix.framework.version}\org.apache.felix.framework-${felix.framework.version}.jar
:EXECUTE
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8
if not "%SHIFT%" == "true" SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8
rem Execute the Java Virtual Machine
- "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.apache.karaf.admin.main.Execute %ARGS%
+ "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.apache.karaf.instance.main.Execute %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties Mon Feb 20 10:14:50 2012
@@ -124,6 +124,6 @@ org.apache.aries.blueprint.synchronous=t
org.apache.aries.proxy.weaving.enabled=
#
-# mvn url handler requires config admin configuration
+# mvn url handler requires config instance configuration
#
org.ops4j.pax.url.mvn.requireConfigAdminConfig=true
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties Mon Feb 20 10:14:50 2012
@@ -56,7 +56,7 @@ karaf.shell.init.script=${karaf.home}/et
# where classname is the class name of the principal object
# (defaults to org.apache.karaf.jaas.modules.RolePrincipal)
# and principal is the name of the principal of that class
-# (defaults to admin).
+# (defaults to instance).
#
# Note that this value can be overriden using the various ConfigAdmin
# configurations for JMX, SSH or the WebConsole.
Modified: karaf/trunk/assemblies/features/standard/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/pom.xml?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/pom.xml (original)
+++ karaf/trunk/assemblies/features/standard/pom.xml Mon Feb 20 10:14:50 2012
@@ -64,16 +64,16 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.core</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>org.apache.karaf.instance.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.command</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>org.apache.karaf.instance.command</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.management</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>org.apache.karaf.instance.management</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.diagnostic</groupId>
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java Mon Feb 20 10:14:50 2012
@@ -24,7 +24,7 @@ import org.osgi.framework.ServiceReferen
public abstract class FeaturesCommandSupport extends OsgiCommandSupport {
protected Object doExecute() throws Exception {
- // Get repository admin service.
+ // Get repository instance service.
ServiceReference ref = getBundleContext().getServiceReference(FeaturesService.class.getName());
if (ref == null) {
System.out.println("FeaturesService service is unavailable.");
Copied: karaf/trunk/instance/command/NOTICE (from r1291022, karaf/trunk/admin/command/NOTICE)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/NOTICE?p2=karaf/trunk/instance/command/NOTICE&p1=karaf/trunk/admin/command/NOTICE&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/command/pom.xml (from r1291022, karaf/trunk/admin/command/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/pom.xml?p2=karaf/trunk/instance/command/pom.xml&p1=karaf/trunk/admin/command/pom.xml&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/pom.xml (original)
+++ karaf/trunk/instance/command/pom.xml Mon Feb 20 10:14:50 2012
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>admin</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>instance</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.admin.command</artifactId>
+ <artifactId>org.apache.karaf.instance.command</artifactId>
<packaging>bundle</packaging>
- <name>Apache Karaf :: Admin :: Command</name>
- <description>Admin shell commands to manipulate Karaf child instances.</description>
+ <name>Apache Karaf :: Instance :: Command</name>
+ <description>Instance shell commands to manipulate Karaf child instances.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -51,8 +51,8 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.core</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>org.apache.karaf.instance.core</artifactId>
</dependency>
<dependency>
@@ -104,7 +104,7 @@
<instructions>
<Import-Package>
!${project.artifactId}*,
- !org.apache.karaf.admin.internal,
+ !org.apache.karaf.instance.internal,
javax.management,
javax.management.loading,
org.apache.aries.blueprint,
@@ -116,11 +116,12 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.admin.main
+ org.apache.karaf.instance.main
</Private-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
+
</project>
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeOptsCommand.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeOptsCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeOptsCommand.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeOptsCommand.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeOptsCommand.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeOptsCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeOptsCommand.java Mon Feb 20 10:14:50 2012
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-@Command(scope = "admin", name = "change-opts", description = "Changes the Java options of an existing container instance.")
-public class ChangeOptsCommand extends AdminCommandSupport {
+@Command(scope = "instance", name = "change-opts", description = "Changes the Java options of an existing container instance.")
+public class ChangeOptsCommand extends InstanceCommandSupport {
@Argument(index = 0, name = "name", description="The name of the container instance", required = true, multiValued = false)
private String instance = null;
@@ -32,4 +32,5 @@ public class ChangeOptsCommand extends A
getExistingInstance(instance).changeJavaOpts(javaOpts);
return null;
}
+
}
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiRegistryPortCommand.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeRmiRegistryPortCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiRegistryPortCommand.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiRegistryPortCommand.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeRmiRegistryPortCommand.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeRmiRegistryPortCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiRegistryPortCommand.java Mon Feb 20 10:14:50 2012
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-@Command(scope = "admin", name = "change-rmi-registry-port", description = "Changes the RMI registry port (used by management layer) of an existing container instance.")
-public class ChangeRmiRegistryPortCommand extends AdminCommandSupport {
+@Command(scope = "instance", name = "change-rmi-registry-port", description = "Changes the RMI registry port (used by management layer) of an existing container instance.")
+public class ChangeRmiRegistryPortCommand extends InstanceCommandSupport {
@Argument(index = 0, name = "name", description = "The name of the container instance", required = true, multiValued = false)
private String instance = null;
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiServerPortCommand.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeRmiServerPortCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiServerPortCommand.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiServerPortCommand.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeRmiServerPortCommand.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeRmiServerPortCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiServerPortCommand.java Mon Feb 20 10:14:50 2012
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-@Command(scope = "admin", name = "change-rmi-server-port", description = "Changes the RMI server port (used by management layer) of an existing instance.")
-public class ChangeRmiServerPortCommand extends AdminCommandSupport {
+@Command(scope = "instance", name = "change-rmi-server-port", description = "Changes the RMI server port (used by management layer) of an existing instance.")
+public class ChangeRmiServerPortCommand extends InstanceCommandSupport {
@Argument(index = 0, name = "name", description = "The name of the container instance", required = true, multiValued = false)
private String instance = null;
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeSshPortCommand.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeSshPortCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeSshPortCommand.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeSshPortCommand.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeSshPortCommand.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ChangeSshPortCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeSshPortCommand.java Mon Feb 20 10:14:50 2012
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-@Command(scope = "admin", name = "change-ssh-port", description = "Changes the secure shell port of an existing container instance.")
-public class ChangeSshPortCommand extends AdminCommandSupport {
+@Command(scope = "instance", name = "change-ssh-port", description = "Changes the secure shell port of an existing container instance.")
+public class ChangeSshPortCommand extends InstanceCommandSupport {
@Argument(index = 0, name = "name", description="The name of the container instance", required = true, multiValued = false)
private String instance = null;
@@ -32,4 +32,5 @@ public class ChangeSshPortCommand extend
getExistingInstance(instance).changeSshPort(port);
return null;
}
+
}
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java Mon Feb 20 10:14:50 2012
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.apache.karaf.admin.InstanceSettings;
+import org.apache.karaf.instance.InstanceSettings;
/**
- * Clone an existing Karaf instance.
+ * Clone an existing instance.
*/
-@Command(scope = "admin", name = "clone", description = "Clones an existing container instance.")
-public class CloneCommand extends AdminCommandSupport {
+@Command(scope = "instance", name = "clone", description = "Clones an existing container instance.")
+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;
@@ -50,7 +50,7 @@ public class CloneCommand extends AdminC
protected Object doExecute() throws Exception {
InstanceSettings settings = new InstanceSettings(sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts, null, null);
- getAdminService().cloneInstance(name, cloneName, settings);
+ getInstanceService().cloneInstance(name, cloneName, settings);
return null;
}
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ConnectCommand.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ConnectCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ConnectCommand.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ConnectCommand.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ConnectCommand.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ConnectCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ConnectCommand.java Mon Feb 20 10:14:50 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import java.util.List;
@@ -24,8 +24,8 @@ import org.apache.karaf.shell.commands.O
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-@Command(scope = "admin", name = "connect", description = "Connects to an existing container instance.")
-public class ConnectCommand extends AdminCommandSupport {
+@Command(scope = "instance", name = "connect", description = "Connects to an existing container instance.")
+public class ConnectCommand extends InstanceCommandSupport {
@Option(name="-u", aliases={"--username"}, description="Remote user name (Default: karaf)", required = false, multiValued = false)
private String username = "karaf";
@@ -56,4 +56,5 @@ public class ConnectCommand extends Admi
session.execute("ssh -l " + username + " -P " + password + " -p " + port + " localhost " + cmdStr);
return null;
}
+
}
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/CreateCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/CreateCommand.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/CreateCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java Mon Feb 20 10:14:50 2012
@@ -14,25 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import java.util.List;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.apache.karaf.admin.InstanceSettings;
-import org.apache.karaf.features.command.completers.AllFeatureCompleter;
-import org.apache.karaf.features.command.completers.FeatureRepositoryCompleter;
-
+import org.apache.karaf.instance.InstanceSettings;
/**
- * Creates a new Karaf instance
- *
- * @version $Rev: 679826 $ $Date: 2008-07-25 17:00:12 +0200 (Fri, 25 Jul 2008) $
+ * Creates a new instance.
*/
-@Command(scope = "admin", name = "create", description = "Creates a new container instance.")
-public class CreateCommand extends AdminCommandSupport
+@Command(scope = "instance", name = "create", description = "Creates a new container instance.")
+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;
@@ -62,7 +57,7 @@ public class CreateCommand extends Admin
protected Object doExecute() throws Exception {
InstanceSettings settings = new InstanceSettings(sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts, featureURLs, features);
- getAdminService().createInstance(instance, settings);
+ getInstanceService().createInstance(instance, settings);
return null;
}
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/DestroyCommand.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/DestroyCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/DestroyCommand.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/DestroyCommand.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/DestroyCommand.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/DestroyCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/DestroyCommand.java Mon Feb 20 10:14:50 2012
@@ -14,20 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
/**
- * Destroy an existing Karaf instance
- *
- * @version $Rev: 679826 $ $Date: 2008-07-25 17:00:12 +0200 (Fri, 25 Jul 2008) $
+ * Destroy an existing instance.
*/
-@Command(scope = "admin", name = "destroy", description = "Destroys an existing container instance.")
-public class DestroyCommand extends AdminCommandSupport
+@Command(scope = "instance", name = "destroy", description = "Destroys an existing container instance.")
+public class DestroyCommand extends InstanceCommandSupport
{
- @Argument(index = 0, name = "name", description="The name of the container instance to destroy", required = true, multiValued = false)
+ @Argument(index = 0, name = "name", description= "The name of the container instance to destroy", required = true, multiValued = false)
private String instance = null;
protected Object doExecute() throws Exception {
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/InstanceCommandSupport.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/AdminCommandSupport.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/InstanceCommandSupport.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/InstanceCommandSupport.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/AdminCommandSupport.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/AdminCommandSupport.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/InstanceCommandSupport.java Mon Feb 20 10:14:50 2012
@@ -14,29 +14,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
-import org.apache.karaf.admin.AdminService;
-import org.apache.karaf.admin.Instance;
+import org.apache.karaf.instance.InstanceService;
+import org.apache.karaf.instance.Instance;
import org.apache.karaf.shell.console.OsgiCommandSupport;
-public abstract class AdminCommandSupport extends OsgiCommandSupport {
+public abstract class InstanceCommandSupport extends OsgiCommandSupport {
- private AdminService adminService;
+ private InstanceService instanceService;
- public AdminService getAdminService() {
- return adminService;
+ public InstanceService getInstanceService() {
+ return instanceService;
}
- public void setAdminService(AdminService adminService) {
- this.adminService = adminService;
+ public void setInstanceService(InstanceService instanceService) {
+ this.instanceService = instanceService;
}
protected Instance getExistingInstance(String name) {
- Instance i = adminService.getInstance(name);
+ Instance i = instanceService.getInstance(name);
if (i == null) {
throw new IllegalArgumentException("Instance '" + name + "' does not exist");
}
return i;
}
+
}
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ListCommand.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ListCommand.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ListCommand.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/ListCommand.java Mon Feb 20 10:14:50 2012
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.admin.Instance;
+import org.apache.karaf.instance.Instance;
/**
* List available instances
*/
-@Command(scope = "admin", name = "list", description = "Lists all existing container instances.")
-public class ListCommand extends AdminCommandSupport {
+@Command(scope = "instance", name = "list", description = "Lists all existing container instances.")
+public class ListCommand extends InstanceCommandSupport {
@Option(name = "-l", aliases = { "--location" }, description = "Displays the location of the container instances", required = false, multiValued = false)
boolean location;
@@ -33,7 +33,7 @@ public class ListCommand extends AdminCo
boolean javaOpts;
protected Object doExecute() throws Exception {
- Instance[] instances = getAdminService().getInstances();
+ Instance[] instances = getInstanceService().getInstances();
if (javaOpts) {
System.out.println(" SSH Port RMI Ports State Pid JavaOpts");
} else if (location) {
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/RenameCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/RenameCommand.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/RenameCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java Mon Feb 20 10:14:50 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
@@ -22,8 +22,8 @@ import org.apache.karaf.shell.commands.C
/**
* Rename an existing Karaf container instance.
*/
-@Command(scope = "admin", name = "rename", description = "Renames an existing container instance.")
-public class RenameCommand extends AdminCommandSupport {
+@Command(scope = "instance", name = "rename", description = "Rename an existing container instance.")
+public class RenameCommand extends InstanceCommandSupport {
@Argument(index = 0, name = "name", description = "The name of the container instance to rename", required = true, multiValued = false)
String instance = null;
@@ -32,7 +32,7 @@ public class RenameCommand extends Admin
String newName = null;
protected Object doExecute() throws Exception {
- getAdminService().renameInstance(instance, newName);
+ getInstanceService().renameInstance(instance, newName);
return null;
}
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/StartCommand.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StartCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/StartCommand.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/StartCommand.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StartCommand.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StartCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/StartCommand.java Mon Feb 20 10:14:50 2012
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.apache.karaf.admin.Instance;
+import org.apache.karaf.instance.Instance;
-@Command(scope = "admin", name = "start", description = "Starts an existing container instance.")
-public class StartCommand extends AdminCommandSupport {
+@Command(scope = "instance", name = "start", description = "Start an existing container instance.")
+public class StartCommand extends InstanceCommandSupport {
@Option(name = "-d", aliases = { "--debug"}, description = "Start the instance in debug mode", required = false, multiValued = false)
private boolean debug;
@@ -67,4 +67,5 @@ public class StartCommand extends AdminC
}
return null;
}
+
}
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/StopCommand.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StopCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/StopCommand.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/StopCommand.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StopCommand.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StopCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/StopCommand.java Mon Feb 20 10:14:50 2012
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-@Command(scope = "admin", name = "stop", description = "Stops an existing container instance.")
-public class StopCommand extends AdminCommandSupport {
+@Command(scope = "instance", name = "stop", description = "Stop an existing container instance.")
+public class StopCommand extends InstanceCommandSupport {
@Argument(index = 0, name = "name", description = "The name of the container instance", required = true, multiValued = false)
private String instance = null;
@@ -29,4 +29,5 @@ public class StopCommand extends AdminCo
getExistingInstance(instance).stop();
return null;
}
+
}
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/completers/InstanceCompleter.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/completers/InstanceCompleter.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/completers/InstanceCompleter.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/completers/InstanceCompleter.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/completers/InstanceCompleter.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/completers/InstanceCompleter.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/completers/InstanceCompleter.java Mon Feb 20 10:14:50 2012
@@ -14,33 +14,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command.completers;
+package org.apache.karaf.instance.command.completers;
import java.util.List;
-import org.apache.karaf.admin.AdminService;
-import org.apache.karaf.admin.Instance;
+import org.apache.karaf.instance.InstanceService;
+import org.apache.karaf.instance.Instance;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.console.Completer;
/**
- * {@link jline.Completor} for server instance names.
- *
- * Displays a list of configured server instances for the Admin commands.
+ * Displays a list of configured server instances for the instance commands.
*
*/
public class InstanceCompleter implements Completer {
- private AdminService adminService;
- public void setAdminService(AdminService adminService) {
- this.adminService = adminService;
+ private InstanceService instanceService;
+
+ public void setInstanceService(InstanceService instanceService) {
+ this.instanceService = instanceService;
}
public int complete(String buffer, int cursor, List candidates) {
StringsCompleter delegate = new StringsCompleter();
- for (Instance instance : adminService.getInstances()) {
+ for (Instance instance : instanceService.getInstances()) {
delegate.getStrings().add(instance.getName());
}
return delegate.complete(buffer, cursor, candidates);
}
+
}
Copied: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/main/Execute.java (from r1291022, karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/main/Execute.java?p2=karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/main/Execute.java&p1=karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/main/Execute.java Mon Feb 20 10:14:50 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.main;
+package org.apache.karaf.instance.main;
import java.io.File;
import java.util.ArrayList;
@@ -23,12 +23,12 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+import org.apache.karaf.instance.command.*;
import org.apache.karaf.shell.commands.Action;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.basic.DefaultActionPreparator;
-import org.apache.karaf.admin.command.*;
-import org.apache.karaf.admin.command.ChangeSshPortCommand;
-import org.apache.karaf.admin.internal.AdminServiceImpl;
+import org.apache.karaf.instance.command.ChangeSshPortCommand;
+import org.apache.karaf.instance.internal.InstanceServiceImpl;
import org.fusesource.jansi.AnsiConsole;
public class Execute {
@@ -57,13 +57,13 @@ public class Execute {
static boolean exitAllowed = true;
/**
- * Environment variable for specifying extra options to the Karaf admin
+ * 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 admin
+ * 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";
@@ -104,9 +104,9 @@ public class Execute {
}
Object command = cls.newInstance();
- if (command instanceof AdminCommandSupport) {
+ if (command instanceof InstanceCommandSupport) {
try {
- execute((AdminCommandSupport) command, storageFile, args);
+ execute((InstanceCommandSupport) command, storageFile, args);
} catch (Exception e) {
System.err.println("Error execution command '" + commandName + "': " + e.getMessage());
if (System.getProperty("karaf.showStackTrace") != null) {
@@ -114,12 +114,12 @@ public class Execute {
}
}
} else {
- System.err.println("Not an admin command: " + commandName);
+ System.err.println("Not an instance command: " + commandName);
exit(-1);
}
}
- static void execute(AdminCommandSupport command, File storageFile, String[] args) throws Exception {
+ 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
@@ -128,10 +128,10 @@ public class Execute {
return;
}
- AdminServiceImpl admin = new AdminServiceImpl();
- admin.setStorageLocation(storageFile);
- admin.init();
- command.setAdminService(admin);
+ InstanceServiceImpl instanceService = new InstanceServiceImpl();
+ instanceService.setStorageLocation(storageFile);
+ instanceService.init();
+ command.setInstanceService(instanceService);
command.execute(null);
}
@@ -152,4 +152,5 @@ public class Execute {
throw new RuntimeException("" + rc);
}
}
+
}
Copied: karaf/trunk/instance/command/src/main/resources/OSGI-INF/blueprint/instance-command.xml (from r1291022, karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/resources/OSGI-INF/blueprint/instance-command.xml?p2=karaf/trunk/instance/command/src/main/resources/OSGI-INF/blueprint/instance-command.xml&p1=karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml (original)
+++ karaf/trunk/instance/command/src/main/resources/OSGI-INF/blueprint/instance-command.xml Mon Feb 20 10:14:50 2012
@@ -22,8 +22,8 @@
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
- <action class="org.apache.karaf.admin.command.CreateCommand">
- <property name="adminService" ref="adminService" />
+ <action class="org.apache.karaf.instance.command.CreateCommand">
+ <property name="instanceService" ref="instanceService" />
</action>
<optional-completers>
<entry key="-f" value-ref="allFeatureCompleter"/>
@@ -31,8 +31,8 @@
</optional-completers>
</command>
<command>
- <action class="org.apache.karaf.admin.command.ConnectCommand">
- <property name="adminService" ref="adminService" />
+ <action class="org.apache.karaf.instance.command.ConnectCommand">
+ <property name="instanceService" ref="instanceService" />
</action>
<completers>
<ref component-id="instanceCompleter" />
@@ -40,13 +40,13 @@
</completers>
</command>
<command>
- <action class="org.apache.karaf.admin.command.ListCommand">
- <property name="adminService" ref="adminService" />
+ <action class="org.apache.karaf.instance.command.ListCommand">
+ <property name="instanceService" ref="instanceService" />
</action>
</command>
<command>
- <action class="org.apache.karaf.admin.command.StartCommand">
- <property name="adminService" ref="adminService" />
+ <action class="org.apache.karaf.instance.command.StartCommand">
+ <property name="instanceService" ref="instanceService" />
</action>
<completers>
<ref component-id="instanceCompleter" />
@@ -54,8 +54,8 @@
</completers>
</command>
<command>
- <action class="org.apache.karaf.admin.command.StopCommand">
- <property name="adminService" ref="adminService" />
+ <action class="org.apache.karaf.instance.command.StopCommand">
+ <property name="instanceService" ref="instanceService" />
</action>
<completers>
<ref component-id="instanceCompleter" />
@@ -63,8 +63,8 @@
</completers>
</command>
<command>
- <action class="org.apache.karaf.admin.command.DestroyCommand">
- <property name="adminService" ref="adminService" />
+ <action class="org.apache.karaf.instance.command.DestroyCommand">
+ <property name="instanceService" ref="instanceService" />
</action>
<completers>
<ref component-id="instanceCompleter" />
@@ -72,8 +72,8 @@
</completers>
</command>
<command>
- <action class="org.apache.karaf.admin.command.RenameCommand">
- <property name="adminService" ref="adminService" />
+ <action class="org.apache.karaf.instance.command.RenameCommand">
+ <property name="instanceService" ref="instanceService" />
</action>
<completers>
<ref component-id="instanceCompleter" />
@@ -81,8 +81,8 @@
</completers>
</command>
<command>
- <action class="org.apache.karaf.admin.command.CloneCommand">
- <property name="adminService" ref="adminService" />
+ <action class="org.apache.karaf.instance.command.CloneCommand">
+ <property name="instanceService" ref="instanceService" />
</action>
<completers>
<ref component-id="instanceCompleter" />
@@ -90,8 +90,8 @@
</completers>
</command>
<command>
- <action class="org.apache.karaf.admin.command.ChangeSshPortCommand">
- <property name="adminService" ref="adminService" />
+ <action class="org.apache.karaf.instance.command.ChangeSshPortCommand">
+ <property name="instanceService" ref="instanceService" />
</action>
<completers>
<ref component-id="instanceCompleter" />
@@ -99,8 +99,8 @@
</completers>
</command>
<command>
- <action class="org.apache.karaf.admin.command.ChangeRmiRegistryPortCommand">
- <property name="adminService" ref="adminService" />
+ <action class="org.apache.karaf.instance.command.ChangeRmiRegistryPortCommand">
+ <property name="instanceService" ref="instanceService" />
</action>
<completers>
<ref component-id="instanceCompleter" />
@@ -108,8 +108,8 @@
</completers>
</command>
<command>
- <action class="org.apache.karaf.admin.command.ChangeRmiServerPortCommand">
- <property name="adminService" ref="adminService" />
+ <action class="org.apache.karaf.instance.command.ChangeRmiServerPortCommand">
+ <property name="instanceService" ref="instanceService" />
</action>
<completers>
<ref component-id="instanceCompleter" />
@@ -117,8 +117,8 @@
</completers>
</command>
<command>
- <action class="org.apache.karaf.admin.command.ChangeOptsCommand">
- <property name="adminService" ref="adminService" />
+ <action class="org.apache.karaf.instance.command.ChangeOptsCommand">
+ <property name="instanceService" ref="instanceService" />
</action>
<completers>
<ref component-id="instanceCompleter" />
@@ -127,11 +127,11 @@
</command>
</command-bundle>
- <reference id="adminService" interface="org.apache.karaf.admin.AdminService" />
+ <reference id="instanceService" interface="org.apache.karaf.instance.InstanceService" />
<reference id="featuresService" interface="org.apache.karaf.features.FeaturesService" />
- <bean id="instanceCompleter" class="org.apache.karaf.admin.command.completers.InstanceCompleter">
- <property name="adminService" ref="adminService" />
+ <bean id="instanceCompleter" class="org.apache.karaf.instance.command.completers.InstanceCompleter">
+ <property name="instanceService" ref="instanceService" />
</bean>
<bean id="allFeatureCompleter" class="org.apache.karaf.features.command.completers.AllFeatureCompleter">
Added: karaf/trunk/instance/command/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/resources/OSGI-INF/bundle.info?rev=1291178&view=auto
==============================================================================
--- karaf/trunk/instance/command/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/instance/command/src/main/resources/OSGI-INF/bundle.info Mon Feb 20 10:14:50 2012
@@ -0,0 +1,29 @@
+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