felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r770981 [1/6] - in /felix/trunk/karaf: ./ assembly/ assembly/src/main/descriptors/ assembly/src/main/distribution/unix-shell/bin/ assembly/src/main/distribution/windows-text/bin/ assembly/src/main/filtered-resources/ assembly/src/main/filte...
Date Sat, 02 May 2009 19:57:24 GMT
Author: gertv
Date: Sat May  2 19:57:13 2009
New Revision: 770981

URL: http://svn.apache.org/viewvc?rev=770981&view=rev
Log:
FELIX-1116: Renaming packages and changing artifact/group ids in the POMs

Added:
    felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties   (contents, props changed)
      - copied, changed from r770975, felix/trunk/karaf/etc/config.properties
    felix/trunk/karaf/client/src/main/java/org/apache/felix/
    felix/trunk/karaf/client/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/client/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/
    felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/blueprint/src/main/resources/org/apache/felix/
    felix/trunk/karaf/deployer/blueprint/src/main/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/deployer/blueprint/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/blueprint/src/test/java/org/apache/felix/
    felix/trunk/karaf/deployer/blueprint/src/test/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/deployer/blueprint/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/features/src/main/java/org/apache/felix/
    felix/trunk/karaf/deployer/features/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/deployer/features/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/
    felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/filemonitor/src/test/java/org/apache/felix/
    felix/trunk/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/
    felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/deployer/spring/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/spring/src/main/resources/org/apache/felix/
    felix/trunk/karaf/deployer/spring/src/main/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/deployer/spring/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/spring/src/test/java/org/apache/felix/
    felix/trunk/karaf/deployer/spring/src/test/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/deployer/spring/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-core/src/main/filtered-resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-core/src/main/filtered-resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-core/src/main/filtered-resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-core/src/test/java/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-core/src/test/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-core/src/test/resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-core/src/test/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-features/src/test/java/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-features/src/test/resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-features/src/test/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-features/src/test/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-packages/src/main/resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-packages/src/main/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-packages/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/itests/src/test/java/org/apache/felix/
    felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/itests/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/jaas/jaas-boot/src/main/java/org/apache/felix/
    felix/trunk/karaf/jaas/jaas-boot/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/jaas/jaas-config/src/main/resources/org/apache/felix/
    felix/trunk/karaf/jaas/jaas-config/src/main/resources/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/jaas/jaas-config/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/jaas/jaas-config/src/test/java/org/apache/felix/
    felix/trunk/karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/
    felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/main/src/main/java/org/apache/felix/
    felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/   (props changed)
      - copied from r770975, felix/trunk/karaf/main/src/main/java/org/apache/servicemix/kernel/
Removed:
    felix/trunk/karaf/client/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/blueprint/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/blueprint/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/features/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/spring/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/spring/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/deployer/spring/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/etc/
    felix/trunk/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-core/src/main/filtered-resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-features/src/test/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-packages/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/itests/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/jaas/jaas-config/src/main/resources/org/apache/servicemix/kernel/
    felix/trunk/karaf/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/
    felix/trunk/karaf/main/src/main/java/org/apache/servicemix/kernel/
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/distribution/unix-shell/bin/servicemix
    felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/servicemix.bat
    felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
    felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties
    felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml
    felix/trunk/karaf/client/pom.xml
    felix/trunk/karaf/client/src/main/java/org/apache/felix/karaf/client/Main.java
    felix/trunk/karaf/demos/pom.xml
    felix/trunk/karaf/demos/smx4web/pom.xml
    felix/trunk/karaf/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java
    felix/trunk/karaf/deployer/blueprint/pom.xml
    felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListener.java
    felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintTransformer.java
    felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintURLHandler.java
    felix/trunk/karaf/deployer/blueprint/src/main/resources/META-INF/spring/blueprint-deployer.xml
    felix/trunk/karaf/deployer/blueprint/src/test/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListenerTest.java
    felix/trunk/karaf/deployer/features/pom.xml
    felix/trunk/karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java
    felix/trunk/karaf/deployer/features/src/main/resources/META-INF/spring/features-deployer.xml
    felix/trunk/karaf/deployer/filemonitor/pom.xml
    felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/DeploymentListener.java
    felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
    felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorActivator.java
    felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/JarUtil.java
    felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/Scanner.java
    felix/trunk/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/BundlePackerTest.java
    felix/trunk/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorTest.java
    felix/trunk/karaf/deployer/pom.xml
    felix/trunk/karaf/deployer/spring/pom.xml
    felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java
    felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java
    felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringURLHandler.java
    felix/trunk/karaf/deployer/spring/src/main/resources/META-INF/spring/spring-deployer.xml
    felix/trunk/karaf/deployer/spring/src/test/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListenerTest.java
    felix/trunk/karaf/deployer/spring/src/test/resources/test.xml
    felix/trunk/karaf/gshell/gshell-admin/pom.xml
    felix/trunk/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/org.apache.servicemix.features.cfg
    felix/trunk/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/startup.properties
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminService.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminServiceMBean.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/Instance.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceMBeanImpl.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/InstanceImpl.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/AdminCommandSupport.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/completers/InstanceCompleter.java
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/servicemix
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/system.properties
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.properties
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.properties
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.properties
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.properties
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.properties
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.properties
    felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.properties
    felix/trunk/karaf/gshell/gshell-config/pom.xml
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/CancelCommand.java
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ConfigCommandSupport.java
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/EditCommand.java
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ListCommand.java
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropDelCommand.java
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropListCommand.java
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropSetCommand.java
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/UpdateCommand.java
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationCompleter.java
    felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationPropertyCompleter.java
    felix/trunk/karaf/gshell/gshell-config/src/main/resources/META-INF/spring/gshell-config.xml
    felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/CancelCommand.properties
    felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/EditCommand.properties
    felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/ListCommand.properties
    felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropDelCommand.properties
    felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropListCommand.properties
    felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropSetCommand.properties
    felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/UpdateCommand.properties
    felix/trunk/karaf/gshell/gshell-core/pom.xml
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationImpl.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationManagerImpl.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/BeanContainerAwareProcessor.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/BeanContainerWrapper.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/CommandBundle.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/LocalConsole.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiAliasRegistry.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandRegistry.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandSupport.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ServiceMixBranding.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ShellWrapper.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/WorkAroundAliasCommand.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/commands/InfoAction.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/CommandParser.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/sshd/BogusPasswordAuthenticator.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/sshd/SshServerFactory.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/vfs/mvn/MvnFileObject.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/vfs/mvn/MvnFileProvider.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/vfs/mvn/MvnFileSystem.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring.handlers
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring.schemas
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-vfs.xml
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/commands.xml
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/commands/InfoAction.properties
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/servicemix-gshell.xsd
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/commands/text/SortAction.properties
    felix/trunk/karaf/gshell/gshell-core/src/test/java/org/apache/felix/karaf/gshell/core/Test.java
    felix/trunk/karaf/gshell/gshell-core/src/test/resources/org/apache/felix/karaf/gshell/core/gshell-test-commands.xml
    felix/trunk/karaf/gshell/gshell-core/src/test/resources/org/apache/felix/karaf/gshell/core/gshell-test.xml
    felix/trunk/karaf/gshell/gshell-features/pom.xml
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/Feature.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesRegistry.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesService.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/Repository.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/FeaturesCommandSupport.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/AvailableFeatureCompleter.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/FeatureRepositoryCompleter.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/InstalledFeatureCompleter.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeatureImpl.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/RepositoryImpl.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/DefaultNamingStrategy.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeature.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedRepository.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagementAgent.java
    felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/NamingStrategy.java
    felix/trunk/karaf/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
    felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.properties
    felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.properties
    felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.properties
    felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.properties
    felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.properties
    felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.properties
    felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.properties
    felix/trunk/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/FeatureTest.java
    felix/trunk/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/FeaturesServiceTest.java
    felix/trunk/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/RepositoryTest.java
    felix/trunk/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImplTest.java
    felix/trunk/karaf/gshell/gshell-features/src/test/resources/org/apache/felix/karaf/gshell/features/repo1.xml
    felix/trunk/karaf/gshell/gshell-log/pom.xml
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayLog.java
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/LruList.java
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/VmLogAppender.java
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/AbsoluteTimeDateFormat.java
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/DateTimeDateFormat.java
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/FormattingInfo.java
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/ISO8601DateFormat.java
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternConverter.java
    felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternParser.java
    felix/trunk/karaf/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml
    felix/trunk/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/DisplayException.properties
    felix/trunk/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/DisplayLog.properties
    felix/trunk/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/SetLogLevel.properties
    felix/trunk/karaf/gshell/gshell-obr/pom.xml
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/FileUtil.java
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ObrCommandSupport.java
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java
    felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/StartCommand.java
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/AddUrlCommand.properties
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/DeployCommand.properties
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/InfoCommand.properties
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/ListCommand.properties
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/ListUrlCommand.properties
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.properties
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.properties
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/SourceCommand.properties
    felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/StartCommand.properties
    felix/trunk/karaf/gshell/gshell-osgi/pom.xml
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleCommand.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundlesCommand.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListBundles.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListServices.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RefreshBundle.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ResolveBundle.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RestartBundle.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Shutdown.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/SpringApplicationListener.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartBundle.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartLevel.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StopBundle.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UninstallBundle.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UpdateBundle.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Util.java
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/BundleLevel.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/Headers.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/InstallBundle.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ListBundles.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ListServices.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/RefreshBundle.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ResolveBundle.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/RestartBundle.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/Shutdown.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StartBundle.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StartLevel.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StopBundle.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/UninstallBundle.properties
    felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/UpdateBundle.properties
    felix/trunk/karaf/gshell/gshell-packages/pom.xml
    felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ExportsCommand.java
    felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ImportsCommand.java
    felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/PackageCommandSupport.java
    felix/trunk/karaf/gshell/gshell-packages/src/main/resources/META-INF/spring/gshell-packages.xml
    felix/trunk/karaf/gshell/gshell-packages/src/main/resources/org/apache/felix/karaf/gshell/packages/ExportsCommand.properties
    felix/trunk/karaf/gshell/gshell-packages/src/main/resources/org/apache/felix/karaf/gshell/packages/ImportsCommand.properties
    felix/trunk/karaf/gshell/gshell-wrapper/pom.xml
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/InstallCommand.java
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/META-INF/spring/gshell-wrapper.xml
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/InstallCommand.properties
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/all/servicemix-wrapper.conf
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/all/servicemix-wrapper.jar
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/linux/libwrapper.so
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/linux/servicemix-wrapper
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/macosx/libwrapper.jnilib
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/macosx/servicemix-wrapper
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/servicemix-wrapper.exe
    felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/wrapper.dll
    felix/trunk/karaf/gshell/pom.xml
    felix/trunk/karaf/itests/pom.xml
    felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/AbstractIntegrationTest.java
    felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/CoreTest.java
    felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/FeaturesTest.java
    felix/trunk/karaf/jaas/jaas-boot/pom.xml
    felix/trunk/karaf/jaas/jaas-boot/src/main/java/org/apache/felix/karaf/jaas/boot/ProxyLoginModule.java
    felix/trunk/karaf/jaas/jaas-config/pom.xml
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/JaasRealm.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeyIsLocked.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreInstance.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreIsLocked.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreManager.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Config.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ConfigParser.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Module.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiConfiguration.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiKeystoreManager.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ProxyLoginModuleInitializer.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstanceParser.java
    felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers
    felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas
    felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml
    felix/trunk/karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/jaas/config/NamespaceHandlerTest.java
    felix/trunk/karaf/jaas/jaas-config/src/test/resources/config.xml
    felix/trunk/karaf/jaas/jaas-config/src/test/resources/privatestore.jks
    felix/trunk/karaf/jaas/jaas-modules/pom.xml
    felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java
    felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java
    felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java
    felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
    felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java
    felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml
    felix/trunk/karaf/jaas/pom.xml
    felix/trunk/karaf/main/pom.xml
    felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
    felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Lock.java
    felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
    felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java
    felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java
    felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/spi/MainService.java
    felix/trunk/karaf/management/pom.xml
    felix/trunk/karaf/pom.xml

Modified: felix/trunk/karaf/assembly/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/pom.xml?rev=770981&r1=770980&r2=770981&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/pom.xml (original)
+++ felix/trunk/karaf/assembly/pom.xml Sat May  2 19:57:13 2009
@@ -22,89 +22,89 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.kernel</groupId>
+        <groupId>org.apache.felix.karaf</groupId>
         <artifactId>kernel</artifactId>
         <version>1.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.servicemix.kernel</groupId>
-    <artifactId>apache-servicemix-kernel</artifactId>
+    <groupId>org.apache.felix.karaf</groupId>
+    <artifactId>apache-felix-karaf</artifactId>
     <packaging>pom</packaging>
     <version>1.2.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Kernel :: Assembly</name>
+    <name>Apache Felix Karaf :: Assembly</name>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.servicemix.kernel</groupId>
-            <artifactId>org.apache.servicemix.kernel.main</artifactId>
+            <groupId>org.apache.felix.karaf</groupId>
+            <artifactId>org.apache.felix.karaf.main</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel</groupId>
-            <artifactId>org.apache.servicemix.kernel.client</artifactId>
+            <groupId>org.apache.felix.karaf</groupId>
+            <artifactId>org.apache.felix.karaf.client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.deployer</groupId>
-            <artifactId>org.apache.servicemix.kernel.deployer.filemonitor</artifactId>
+            <groupId>org.apache.felix.karaf.deployer</groupId>
+            <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.deployer</groupId>
-            <artifactId>org.apache.servicemix.kernel.deployer.spring</artifactId>
+            <groupId>org.apache.felix.karaf.deployer</groupId>
+            <artifactId>org.apache.felix.karaf.deployer.spring</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.deployer</groupId>
-            <artifactId>org.apache.servicemix.kernel.deployer.blueprint</artifactId>
+            <groupId>org.apache.felix.karaf.deployer</groupId>
+            <artifactId>org.apache.felix.karaf.deployer.blueprint</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.deployer</groupId>
-            <artifactId>org.apache.servicemix.kernel.deployer.features</artifactId>
+            <groupId>org.apache.felix.karaf.deployer</groupId>
+            <artifactId>org.apache.felix.karaf.deployer.features</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.gshell</groupId>
-            <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
+            <groupId>org.apache.felix.karaf.gshell</groupId>
+            <artifactId>org.apache.felix.karaf.gshell.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.gshell</groupId>
-            <artifactId>org.apache.servicemix.kernel.gshell.admin</artifactId>
+            <groupId>org.apache.felix.karaf.gshell</groupId>
+            <artifactId>org.apache.felix.karaf.gshell.admin</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.gshell</groupId>
-            <artifactId>org.apache.servicemix.kernel.gshell.obr</artifactId>
+            <groupId>org.apache.felix.karaf.gshell</groupId>
+            <artifactId>org.apache.felix.karaf.gshell.obr</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.gshell</groupId>
-            <artifactId>org.apache.servicemix.kernel.gshell.osgi</artifactId>
+            <groupId>org.apache.felix.karaf.gshell</groupId>
+            <artifactId>org.apache.felix.karaf.gshell.osgi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.gshell</groupId>
-            <artifactId>org.apache.servicemix.kernel.gshell.log</artifactId>
+            <groupId>org.apache.felix.karaf.gshell</groupId>
+            <artifactId>org.apache.felix.karaf.gshell.log</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.gshell</groupId>
-            <artifactId>org.apache.servicemix.kernel.gshell.features</artifactId>
+            <groupId>org.apache.felix.karaf.gshell</groupId>
+            <artifactId>org.apache.felix.karaf.gshell.features</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.gshell</groupId>
-            <artifactId>org.apache.servicemix.kernel.gshell.config</artifactId>
+            <groupId>org.apache.felix.karaf.gshell</groupId>
+            <artifactId>org.apache.felix.karaf.gshell.config</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.gshell</groupId>
-            <artifactId>org.apache.servicemix.kernel.gshell.packages</artifactId>
+            <groupId>org.apache.felix.karaf.gshell</groupId>
+            <artifactId>org.apache.felix.karaf.gshell.packages</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.jaas</groupId>
-            <artifactId>org.apache.servicemix.kernel.jaas.boot</artifactId>
+            <groupId>org.apache.felix.karaf.jaas</groupId>
+            <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.jaas</groupId>
-            <artifactId>org.apache.servicemix.kernel.jaas.config</artifactId>
+            <groupId>org.apache.felix.karaf.jaas</groupId>
+            <artifactId>org.apache.felix.karaf.jaas.config</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.jaas</groupId>
-            <artifactId>org.apache.servicemix.kernel.jaas.modules</artifactId>
+            <groupId>org.apache.felix.karaf.jaas</groupId>
+            <artifactId>org.apache.felix.karaf.jaas.modules</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel</groupId>
-            <artifactId>org.apache.servicemix.kernel.management</artifactId>
+            <groupId>org.apache.felix.karaf</groupId>
+            <artifactId>org.apache.felix.karaf.management</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.osgi</groupId>
@@ -268,20 +268,20 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.servicemix.kernel</groupId>
-                                    <artifactId>org.apache.servicemix.kernel.main</artifactId>
+                                    <groupId>org.apache.felix.karaf</groupId>
+                                    <artifactId>org.apache.felix.karaf.main</artifactId>
                                     <outputDirectory>target/dependencies</outputDirectory>
                                     <destFileName>servicemix.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.servicemix.kernel</groupId>
-                                    <artifactId>org.apache.servicemix.kernel.client</artifactId>
+                                    <groupId>org.apache.felix.karaf</groupId>
+                                    <artifactId>org.apache.felix.karaf.client</artifactId>
                                     <outputDirectory>target/dependencies</outputDirectory>
                                     <destFileName>servicemix-client.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.servicemix.kernel.jaas</groupId>
-                                    <artifactId>org.apache.servicemix.kernel.jaas.boot</artifactId>
+                                    <groupId>org.apache.felix.karaf.jaas</groupId>
+                                    <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
                                     <outputDirectory>target/dependencies</outputDirectory>
                                     <destFileName>servicemix-jaas-boot.jar</destFileName>
                                 </artifactItem>

Modified: felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml?rev=770981&r1=770980&r2=770981&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml Sat May  2 19:57:13 2009
@@ -91,13 +91,6 @@
 
     <files>
         <file>
-            <source>${basedir}/../etc/config.properties</source>          
-            <outputDirectory>/etc/</outputDirectory>
-            <destName>config.properties</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE.txt</destName>
@@ -113,8 +106,8 @@
         </file>
         <file>
             <source>${basedir}/target/classes/features.xml</source>
-            <outputDirectory>/system/org/apache/servicemix/kernel/apache-servicemix-kernel/${version}</outputDirectory>
-            <destName>apache-servicemix-kernel-${version}-features.xml</destName>
+            <outputDirectory>/system/org/apache/felix/karaf/apache-felix-karaf/${version}</outputDirectory>
+            <destName>apache-felix-karaf-${version}-features.xml</destName>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
@@ -216,46 +209,46 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/kernel/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>org/apache/felix/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
-                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.management</include>
+                <include>org.apache.felix.karaf:org.apache.felix.karaf.management</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/kernel/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
-                <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.filemonitor</include>
-                <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.spring</include>
-                <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.blueprint</include>
-                <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.features</include>
+                <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.filemonitor</include>
+                <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring</include>
+                <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint</include>
+                <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/kernel/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>org/apache/felix/karaf/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.admin</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.log</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.config</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.packages</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.core</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.admin</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.osgi</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.log</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.features</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.config</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.packages</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/kernel/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>org/apache/felix/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
-                <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
-                <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.modules</include>
+                <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.config</include>
+                <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.modules</include>
             </includes>
         </dependencySet>
         <dependencySet>

Modified: felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml?rev=770981&r1=770980&r2=770981&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml Sat May  2 19:57:13 2009
@@ -83,13 +83,6 @@
 
     <files>
         <file>
-            <source>${basedir}/../etc/config.properties</source>          
-            <outputDirectory>/etc/</outputDirectory>
-            <destName>config.properties</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE.txt</destName>
@@ -105,8 +98,8 @@
         </file>
         <file>
             <source>${basedir}/target/classes/features.xml</source>
-            <outputDirectory>/system/org/apache/servicemix/kernel/apache-servicemix-kernel/${version}</outputDirectory>
-            <destName>apache-servicemix-kernel-${version}-features.xml</destName>
+            <outputDirectory>/system/org/apache/felix/karaf/apache-felix-karaf/${version}</outputDirectory>
+            <destName>apache-felix-karaf-${version}-features.xml</destName>
             <fileMode>0644</fileMode>
             <lineEnding>dos</lineEnding>
         </file>
@@ -208,46 +201,46 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/kernel/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>org/apache/felix/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
-                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.management</include>
+                <include>org.apache.felix.karaf:org.apache.felix.karaf.management</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/kernel/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
-                <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.filemonitor</include>
-                <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.spring</include>
-                <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.blueprint</include>
-                <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.features</include>
+                <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.filemonitor</include>
+                <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring</include>
+                <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint</include>
+                <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/kernel/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>org/apache/felix/karaf/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.admin</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.log</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.config</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.packages</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.core</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.admin</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.osgi</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.log</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.features</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.config</include>
+                <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.packages</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/kernel/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>org/apache/felix/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
-                <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
-                <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.modules</include>
+                <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.config</include>
+                <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.modules</include>
             </includes>
         </dependencySet>
         <dependencySet>

Modified: felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/servicemix
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/servicemix?rev=770981&r1=770980&r2=770981&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/servicemix (original)
+++ felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/servicemix Sat May  2 19:57:13 2009
@@ -281,7 +281,7 @@
         SERVICEMIX_HOME=`cygpath --path --windows "$SERVICEMIX_HOME"`
         SERVICEMIX_BASE=`cygpath --path --windows "$SERVICEMIX_BASE"`
     fi
-    exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -Dservicemix.base="$SERVICEMIX_BASE" -Djava.util.logging.config.file=$SERVICEMIX_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" org.apache.servicemix.kernel.main.Main $*
+    exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -Dservicemix.base="$SERVICEMIX_BASE" -Djava.util.logging.config.file=$SERVICEMIX_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" org.apache.felix.karaf.main.Main $*
 }
 
 main() {

Modified: felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/servicemix.bat
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/servicemix.bat?rev=770981&r1=770980&r2=770981&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/servicemix.bat (original)
+++ felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/servicemix.bat Sat May  2 19:57:13 2009
@@ -152,7 +152,7 @@
     if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8
     if not "%SHIFT%" == "true" SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8    
     rem Execute the Java Virtual Machine
-    "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dservicemix.home="%SERVICEMIX_HOME%" -Dservicemix.base="%SERVICEMIX_BASE%" -Djava.util.logging.config.file=%SERVICEMIX_BASE%\etc\java.util.logging.properties org.apache.servicemix.kernel.main.Main %ARGS%
+    "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dservicemix.home="%SERVICEMIX_HOME%" -Dservicemix.base="%SERVICEMIX_BASE%" -Djava.util.logging.config.file=%SERVICEMIX_BASE%\etc\java.util.logging.properties org.apache.felix.karaf.main.Main %ARGS%
 
 rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 

Copied: felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties (from r770975, felix/trunk/karaf/etc/config.properties)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties?p2=felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties&p1=felix/trunk/karaf/etc/config.properties&r1=770975&r2=770981&rev=770981&view=diff
==============================================================================
--- felix/trunk/karaf/etc/config.properties (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties Sat May  2 19:57:13 2009
@@ -25,10 +25,10 @@
  org.osgi.service.packageadmin; version=1.2.0, \
  org.osgi.service.startlevel; version=1.1.0, \
  org.osgi.service.url; version=1.0.0, \
- org.apache.servicemix.kernel.main.spi; version=1.0.0, \
- org.apache.servicemix.kernel.jaas.boot, \
+ org.apache.felix.karaf.main.spi, \
+ org.apache.felix.karaf.jaas.boot, \
  org.osgi.util.tracker; version=1.3.3, \
- org.apache.servicemix.kernel.version, \
+ org.apache.felix.karaf.version, \
  ${jre-${java.specification.version}}
 org.osgi.framework.bootdelegation=sun.*,com.sun.management*
 

Propchange: felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg?rev=770981&r1=770980&r2=770981&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg Sat May  2 19:57:13 2009
@@ -20,7 +20,7 @@
 #
 # Comma separated list of features repositories to register by default
 #
-featuresRepositories=mvn:org.apache.servicemix.kernel/apache-servicemix-kernel/${version}/xml/features
+featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${version}/xml/features
 
 #
 # Comma separated list of features to install at startup

Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties?rev=770981&r1=770980&r2=770981&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties Sat May  2 19:57:13 2009
@@ -34,7 +34,7 @@
 org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
 org/apache/geronimo/specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}/geronimo-annotation_1.0_spec-${geronimo.annotation.version}.jar=10
 org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apache.felix.prefs-${felix.prefs.version}.jar=10
-org/apache/servicemix/kernel/deployer/org.apache.servicemix.kernel.deployer.filemonitor/${pom.version}/org.apache.servicemix.kernel.deployer.filemonitor-${pom.version}.jar=15
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.filemonitor/${pom.version}/org.apache.felix.karaf.deployer.filemonitor-${pom.version}.jar=15
 
 #
 # The rest of the services..
@@ -54,18 +54,18 @@
 org/springframework/osgi/spring-osgi-core/${spring.osgi.version}/spring-osgi-core-${spring.osgi.version}.jar=30
 org/springframework/osgi/spring-osgi-extender/${spring.osgi.version}/spring-osgi-extender-${spring.osgi.version}.jar=30
 org/springframework/osgi/spring-osgi-io/${spring.osgi.version}/spring-osgi-io-${spring.osgi.version}.jar=30
-org/apache/servicemix/kernel/deployer/org.apache.servicemix.kernel.deployer.spring/${pom.version}/org.apache.servicemix.kernel.deployer.spring-${pom.version}.jar=30
-org/apache/servicemix/kernel/deployer/org.apache.servicemix.kernel.deployer.blueprint/${pom.version}/org.apache.servicemix.kernel.deployer.blueprint-${pom.version}.jar=30
-org/apache/servicemix/kernel/deployer/org.apache.servicemix.kernel.deployer.features/${pom.version}/org.apache.servicemix.kernel.deployer.features-${pom.version}.jar=30
-org/apache/servicemix/kernel/org.apache.servicemix.kernel.management/${pom.version}/org.apache.servicemix.kernel.management-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.admin/${pom.version}/org.apache.servicemix.kernel.gshell.admin-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.osgi/${pom.version}/org.apache.servicemix.kernel.gshell.osgi-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.features/${pom.version}/org.apache.servicemix.kernel.gshell.features-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.log/${pom.version}/org.apache.servicemix.kernel.gshell.log-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.config/${pom.version}/org.apache.servicemix.kernel.gshell.config-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.packages/${pom.version}/org.apache.servicemix.kernel.gshell.packages-${pom.version}.jar=30
-org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.config/${pom.version}/org.apache.servicemix.kernel.jaas.config-${pom.version}.jar=30
-org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.modules/${pom.version}/org.apache.servicemix.kernel.jaas.modules-${pom.version}.jar=30
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.spring/${pom.version}/org.apache.felix.karaf.deployer.spring-${pom.version}.jar=30
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.blueprint/${pom.version}/org.apache.felix.karaf.deployer.blueprint-${pom.version}.jar=30
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.features/${pom.version}/org.apache.felix.karaf.deployer.features-${pom.version}.jar=30
+org/apache/felix/karaf/org.apache.felix.karaf.management/${pom.version}/org.apache.felix.karaf.management-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.admin/${pom.version}/org.apache.felix.karaf.gshell.admin-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.osgi/${pom.version}/org.apache.felix.karaf.gshell.osgi-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.features/${pom.version}/org.apache.felix.karaf.gshell.features-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.log/${pom.version}/org.apache.felix.karaf.gshell.log-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.config/${pom.version}/org.apache.felix.karaf.gshell.config-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.packages/${pom.version}/org.apache.felix.karaf.gshell.packages-${pom.version}.jar=30
+org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.config/${pom.version}/org.apache.felix.karaf.jaas.config-${pom.version}.jar=30
+org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.modules/${pom.version}/org.apache.felix.karaf.jaas.modules-${pom.version}.jar=30
 org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
 org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30
 org/osgi/jmx/${osgi.jmx.version}/jmx-${osgi.jmx.version}.jar=30
@@ -74,5 +74,5 @@
 #
 # Start console last
 #
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.core/${pom.version}/org.apache.servicemix.kernel.gshell.core-${pom.version}.jar=40
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.core/${pom.version}/org.apache.felix.karaf.gshell.core-${pom.version}.jar=40
 

Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml?rev=770981&r1=770980&r2=770981&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml Sat May  2 19:57:13 2009
@@ -18,10 +18,10 @@
 -->
 <features>
     <feature name="wrapper" version="${version}">
-        <bundle>mvn:org.apache.servicemix.kernel.gshell/org.apache.servicemix.kernel.gshell.wrapper/${version}</bundle>
+        <bundle>mvn:org.apache.felix.karaf.gshell/org.apache.felix.karaf.gshell.wrapper/${version}</bundle>
     </feature>
     <feature name="obr" version="${version}">
         <bundle>mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.kernel.gshell/org.apache.servicemix.kernel.gshell.obr/${version}</bundle>
+        <bundle>mvn:org.apache.felix.karaf.gshell/org.apache.felix.karaf.gshell.obr/${version}</bundle>
     </feature>
 </features>

Modified: felix/trunk/karaf/client/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/client/pom.xml?rev=770981&r1=770980&r2=770981&view=diff
==============================================================================
--- felix/trunk/karaf/client/pom.xml (original)
+++ felix/trunk/karaf/client/pom.xml Sat May  2 19:57:13 2009
@@ -22,21 +22,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.kernel</groupId>
+        <groupId>org.apache.felix.karaf</groupId>
         <artifactId>kernel</artifactId>
         <version>1.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.servicemix.kernel</groupId>
-    <artifactId>org.apache.servicemix.kernel.client</artifactId>
+    <groupId>org.apache.felix.karaf</groupId>
+    <artifactId>org.apache.felix.karaf.client</artifactId>
     <packaging>bundle</packaging>
     <version>1.2.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Kernel :: Client</name>
+    <name>Apache Felix Karaf :: Client</name>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.servicemix.kernel.gshell</groupId>
-            <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
+            <groupId>org.apache.felix.karaf.gshell</groupId>
+            <artifactId>org.apache.felix.karaf.gshell.core</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -61,19 +61,19 @@
                 <configuration>
                     <instructions>
                         <_donotcopy>(CVS|.svn|config.properties)</_donotcopy>
-                        <Main-Class>org.apache.servicemix.kernel.client.Main</Main-Class>
+                        <Main-Class>org.apache.felix.karaf.client.Main</Main-Class>
                         <Class-Path>
                             ../system/com/google/code/sshd/sshd/${sshd.version}/sshd-${sshd.version}.jar
-                            ../system/org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.core/${pom.version}/org.apache.servicemix.kernel.gshell.core-${pom.version}.jar
+                            ../system/org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.core/${pom.version}/org.apache.felix.karaf.gshell.core-${pom.version}.jar
                             ../system/org/apache/servicemix/bundles/org.apache.servicemix.bundles.mina/${mina.version}/org.apache.servicemix.bundles.mina-${mina.version}.jar
                             ../system/org/apache/servicemix/bundles/org.apache.servicemix.bundles.jline/${jline.version}/org.apache.servicemix.bundles.jline-${jline.version}.jar
                         </Class-Path>
                         <Bundle-Name>Apache ServiceMix Shell Client</Bundle-Name>
-                        <Bundle-Description>Shell client bundle for Apache ServiceMix Kernel.</Bundle-Description>
+                        <Bundle-Description>Shell client bundle for Apache Felix Karaf.</Bundle-Description>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.apache.servicemix.kernel.client</Export-Package>
+                        <Export-Package>org.apache.felix.karaf.client</Export-Package>
                         <Private-Package>
-                            org.apache.servicemix.kernel.client;-split-package:=merge-first,
+                            org.apache.felix.karaf.client;-split-package:=merge-first,
                             org.slf4j;-split-package:=merge-first,
                             org.slf4j.spi;-split-package:=merge-first,
                             org.slf4j.helpers;-split-package:=merge-first,

Propchange: felix/trunk/karaf/client/src/main/java/org/apache/felix/karaf/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/karaf/client/src/main/java/org/apache/felix/karaf/client/Main.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/client/src/main/java/org/apache/felix/karaf/client/Main.java?rev=770981&r1=770975&r2=770981&view=diff
==============================================================================
--- felix/trunk/karaf/client/src/main/java/org/apache/felix/karaf/client/Main.java (original)
+++ felix/trunk/karaf/client/src/main/java/org/apache/felix/karaf/client/Main.java Sat May  2 19:57:13 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.kernel.client;
+package org.apache.felix.karaf.client;
 
 import org.apache.sshd.ClientChannel;
 import org.apache.sshd.ClientSession;
@@ -46,7 +46,7 @@
                 } else if (args[i].equals("-p")) {
                     password = args[++i];
                 } else if (args[i].equals("--help")) {
-                    System.out.println("Apache ServiceMix Kernel client");
+                    System.out.println("Apache Felix Karaf client");
                     System.out.println("  -a [port]     specify the port to connect to");
                     System.out.println("  -h [host]     specify the host to connect to");
                     System.out.println("  -u [user]     specify the user name");



Mime
View raw message