Optimize import statements
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/kernel/trunk@750809 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java b/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java
index 9f4071e..b7934ec 100644
--- a/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java
+++ b/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java
@@ -18,8 +18,8 @@
import java.io.File;
-import javax.servlet.ServletContextListener;
import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
import org.apache.servicemix.kernel.main.Main;
diff --git a/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/JarUtil.java b/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/JarUtil.java
index 81737bd..98b6036 100644
--- a/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/JarUtil.java
+++ b/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/JarUtil.java
@@ -17,17 +17,17 @@
*/
package org.apache.servicemix.kernel.filemonitor;
-import java.io.FileOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.FileInputStream;
import java.io.BufferedOutputStream;
-import java.util.zip.ZipOutputStream;
-import java.util.zip.ZipEntry;
-import java.util.jar.JarOutputStream;
-import java.util.jar.JarFile;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.util.Collections;
import java.util.Set;
+import java.util.jar.JarFile;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
public class JarUtil {
diff --git a/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/Process.java b/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/Process.java
index cfedd9c..eedb31d 100644
--- a/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/Process.java
+++ b/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/Process.java
@@ -16,8 +16,6 @@
*/
package org.apache.servicemix.jpm;
-import java.io.InputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.Serializable;
diff --git a/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ProcessBuilder.java b/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ProcessBuilder.java
index 2319780..6862222 100644
--- a/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ProcessBuilder.java
+++ b/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ProcessBuilder.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.jpm;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
/**
* Interface used to create new processes.
diff --git a/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessBuilderImpl.java b/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessBuilderImpl.java
index 8fbb016..649da6b 100644
--- a/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessBuilderImpl.java
+++ b/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessBuilderImpl.java
@@ -16,14 +16,8 @@
*/
package org.apache.servicemix.jpm.impl;
-import java.io.IOException;
import java.io.File;
-import java.io.InputStreamReader;
-import java.io.FileInputStream;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
+import java.io.IOException;
import org.apache.servicemix.jpm.Process;
import org.apache.servicemix.jpm.ProcessBuilder;
diff --git a/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessImpl.java b/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessImpl.java
index 056b063..71146fa 100644
--- a/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessImpl.java
+++ b/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessImpl.java
@@ -16,18 +16,15 @@
*/
package org.apache.servicemix.jpm.impl;
-import java.io.OutputStream;
-import java.io.InputStream;
-import java.io.File;
import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.FileOutputStream;
+import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.InterruptedIOException;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
import org.apache.servicemix.jpm.Process;
diff --git a/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ScriptUtils.java b/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ScriptUtils.java
index 8e66bca..869c958 100644
--- a/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ScriptUtils.java
+++ b/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ScriptUtils.java
@@ -17,14 +17,14 @@
package org.apache.servicemix.jpm.impl;
import java.io.File;
-import java.io.InputStream;
-import java.io.PrintStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
+import java.io.InputStream;
import java.io.InterruptedIOException;
-import java.util.Scanner;
+import java.io.OutputStream;
+import java.io.PrintStream;
import java.util.Map;
+import java.util.Scanner;
public class ScriptUtils {
diff --git a/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java b/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java
index 3a74d4e..54283a8 100644
--- a/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java
+++ b/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java
@@ -16,26 +16,26 @@
*/
package org.apache.servicemix.kernel.gshell.admin.internal;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Scanner;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.PrintStream;
-import java.io.FileOutputStream;
import java.io.OutputStream;
+import java.io.PrintStream;
import java.net.ServerSocket;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Scanner;
-import org.apache.servicemix.kernel.gshell.admin.AdminService;
-import org.apache.servicemix.kernel.gshell.admin.Instance;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gshell.shell.ShellContextHolder;
import org.apache.geronimo.gshell.shell.ShellContext;
-import org.osgi.service.prefs.PreferencesService;
-import org.osgi.service.prefs.Preferences;
+import org.apache.geronimo.gshell.shell.ShellContextHolder;
+import org.apache.servicemix.kernel.gshell.admin.AdminService;
+import org.apache.servicemix.kernel.gshell.admin.Instance;
import org.osgi.service.prefs.BackingStoreException;
+import org.osgi.service.prefs.Preferences;
+import org.osgi.service.prefs.PreferencesService;
import org.springframework.beans.factory.InitializingBean;
public class AdminServiceImpl implements AdminService, InitializingBean {
diff --git a/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceMBeanImpl.java b/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceMBeanImpl.java
index b6f7e58..a53b663 100644
--- a/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceMBeanImpl.java
+++ b/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceMBeanImpl.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.kernel.gshell.admin.internal;
-import org.apache.servicemix.kernel.gshell.admin.AdminServiceMBean;
import org.apache.servicemix.kernel.gshell.admin.AdminService;
+import org.apache.servicemix.kernel.gshell.admin.AdminServiceMBean;
import org.apache.servicemix.kernel.gshell.admin.Instance;
public class AdminServiceMBeanImpl implements AdminServiceMBean {
diff --git a/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/InstanceImpl.java b/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/InstanceImpl.java
index 3db7893..3815ca5 100644
--- a/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/InstanceImpl.java
+++ b/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/InstanceImpl.java
@@ -16,22 +16,22 @@
*/
package org.apache.servicemix.kernel.gshell.admin.internal;
-import java.io.InputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
import java.io.FileOutputStream;
-import java.io.OutputStream;
import java.io.FilenameFilter;
-import java.util.Properties;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.net.Socket;
+import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jpm.Process;
import org.apache.servicemix.jpm.ProcessBuilderFactory;
import org.apache.servicemix.jpm.impl.ScriptUtils;
import org.apache.servicemix.kernel.gshell.admin.Instance;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
public class InstanceImpl implements Instance {
diff --git a/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/AdminCommandSupport.java b/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/AdminCommandSupport.java
index e731fd2..9da97b4 100644
--- a/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/AdminCommandSupport.java
+++ b/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/AdminCommandSupport.java
@@ -19,8 +19,6 @@
import org.apache.servicemix.kernel.gshell.admin.AdminService;
import org.apache.servicemix.kernel.gshell.admin.Instance;
import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
-import org.apache.geronimo.gshell.command.CommandContext;
-import org.osgi.framework.ServiceReference;
public abstract class AdminCommandSupport extends OsgiCommandSupport {
diff --git a/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java b/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java
index c95d5fb..244b9f8 100644
--- a/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java
+++ b/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java
@@ -20,9 +20,7 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.shell.ShellContextHolder;
-import org.osgi.framework.ServiceReference;
public class ConnectCommand extends AdminCommandSupport {
diff --git a/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.java b/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.java
index b2f227c..6084caa 100644
--- a/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.java
+++ b/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.java
@@ -17,7 +17,6 @@
package org.apache.servicemix.kernel.gshell.admin.internal.commands;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.clp.Option;
/**
* Creates a new servicemix instance
diff --git a/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java b/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java
index 19f616a..8328813 100644
--- a/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java
+++ b/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java
@@ -18,8 +18,8 @@
import java.io.File;
-import org.apache.servicemix.jpm.impl.ScriptUtils;
import junit.framework.TestCase;
+import org.apache.servicemix.jpm.impl.ScriptUtils;
public class ProcessTest extends TestCase {
diff --git a/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/EditCommand.java b/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/EditCommand.java
index d0516e8..f041da3 100644
--- a/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/EditCommand.java
+++ b/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/EditCommand.java
@@ -18,9 +18,9 @@
import java.util.Dictionary;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
+import org.osgi.service.cm.ConfigurationAdmin;
public class EditCommand extends ConfigCommandSupport {
diff --git a/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/ListCommand.java b/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/ListCommand.java
index d3bf15f..7657d6b 100644
--- a/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/ListCommand.java
+++ b/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/ListCommand.java
@@ -16,12 +16,12 @@
*/
package org.apache.servicemix.kernel.gshell.config;
-import java.util.Enumeration;
import java.util.Dictionary;
+import java.util.Enumeration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.cm.Configuration;
import org.apache.geronimo.gshell.clp.Argument;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
public class ListCommand extends ConfigCommandSupport {
diff --git a/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropDelCommand.java b/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropDelCommand.java
index 438d13a..8e87dc7 100644
--- a/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropDelCommand.java
+++ b/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropDelCommand.java
@@ -18,8 +18,8 @@
import java.util.Dictionary;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.apache.geronimo.gshell.clp.Argument;
+import org.osgi.service.cm.ConfigurationAdmin;
public class PropDelCommand extends ConfigCommandSupport {
diff --git a/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropSetCommand.java b/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropSetCommand.java
index a2ad45b..a0c3112 100644
--- a/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropSetCommand.java
+++ b/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropSetCommand.java
@@ -18,8 +18,8 @@
import java.util.Dictionary;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.apache.geronimo.gshell.clp.Argument;
+import org.osgi.service.cm.ConfigurationAdmin;
public class PropSetCommand extends ConfigCommandSupport {
diff --git a/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/UpdateCommand.java b/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/UpdateCommand.java
index 9ec7dc2..1c6683f 100644
--- a/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/UpdateCommand.java
+++ b/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/UpdateCommand.java
@@ -18,8 +18,8 @@
import java.util.Dictionary;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
public class UpdateCommand extends ConfigCommandSupport {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationImpl.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationImpl.java
index 6b25cbb..350fd63 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationImpl.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationImpl.java
@@ -24,11 +24,10 @@
import org.apache.geronimo.gshell.application.Application;
import org.apache.geronimo.gshell.application.ClassPath;
-import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.application.model.ApplicationModel;
import org.apache.geronimo.gshell.artifact.Artifact;
-
+import org.apache.geronimo.gshell.command.Variables;
+import org.apache.geronimo.gshell.io.IO;
import org.springframework.beans.factory.InitializingBean;
public class ApplicationImpl implements Application, InitializingBean {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationManagerImpl.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationManagerImpl.java
index 596a2ca..7465900 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationManagerImpl.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationManagerImpl.java
@@ -16,19 +16,19 @@
*/
package org.apache.servicemix.kernel.gshell.core;
-import org.apache.geronimo.gshell.application.ApplicationManager;
-import org.apache.geronimo.gshell.application.ApplicationConfiguration;
import org.apache.geronimo.gshell.application.Application;
-import org.apache.geronimo.gshell.shell.Shell;
-import org.apache.geronimo.gshell.wisdom.application.ShellCreatedEvent;
+import org.apache.geronimo.gshell.application.ApplicationConfiguration;
+import org.apache.geronimo.gshell.application.ApplicationManager;
import org.apache.geronimo.gshell.event.EventPublisher;
import org.apache.geronimo.gshell.io.SystemOutputHijacker;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.DisposableBean;
+import org.apache.geronimo.gshell.shell.Shell;
+import org.apache.geronimo.gshell.wisdom.application.ShellCreatedEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
public class ApplicationManagerImpl implements ApplicationManager, ApplicationContextAware, InitializingBean, DisposableBean {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerAwareProcessor.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerAwareProcessor.java
index 127b4ee..7deacb1 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerAwareProcessor.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerAwareProcessor.java
@@ -20,11 +20,11 @@
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerAware;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContextAware;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
public class BeanContainerAwareProcessor implements InitializingBean, BeanPostProcessor, ApplicationContextAware {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerWrapper.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerWrapper.java
index d17b382..edc15d7 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerWrapper.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerWrapper.java
@@ -18,16 +18,16 @@
*/
package org.apache.servicemix.kernel.gshell.core;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Collection;
import java.net.URL;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.context.ApplicationContext;
public class BeanContainerWrapper implements BeanContainer {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/CommandBundle.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/CommandBundle.java
index b7671bf..2111072 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/CommandBundle.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/CommandBundle.java
@@ -18,27 +18,27 @@
*/
package org.apache.servicemix.kernel.gshell.core;
-import java.util.Dictionary;
-import java.util.Properties;
-import java.util.List;
import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.List;
+import java.util.Properties;
-import org.springframework.osgi.context.BundleContextAware;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ApplicationContext;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
+import org.apache.geronimo.gshell.command.Alias;
import org.apache.geronimo.gshell.command.Command;
import org.apache.geronimo.gshell.command.Link;
-import org.apache.geronimo.gshell.command.Alias;
-import org.apache.geronimo.gshell.registry.CommandRegistry;
import org.apache.geronimo.gshell.registry.AliasRegistry;
+import org.apache.geronimo.gshell.registry.CommandRegistry;
import org.apache.geronimo.gshell.wisdom.command.LinkCommand;
import org.apache.geronimo.gshell.wisdom.registry.CommandLocationImpl;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.osgi.context.BundleContextAware;
public class CommandBundle implements BundleContextAware, InitializingBean, DisposableBean, ApplicationContextAware {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/LocalConsole.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/LocalConsole.java
index 0329add..98c7193 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/LocalConsole.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/LocalConsole.java
@@ -18,20 +18,20 @@
*/
package org.apache.servicemix.kernel.gshell.core;
+import java.util.Arrays;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import java.util.Arrays;
-import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.notification.ExitNotification;
+import org.apache.geronimo.gshell.shell.Shell;
import org.apache.servicemix.kernel.main.spi.MainService;
-import org.springframework.osgi.context.BundleContextAware;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
-import org.osgi.framework.FrameworkListener;
import org.osgi.framework.FrameworkEvent;
+import org.osgi.framework.FrameworkListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.osgi.context.BundleContextAware;
public class LocalConsole implements Runnable, BundleContextAware {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiAliasRegistry.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiAliasRegistry.java
index d496b70..a09ce0b 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiAliasRegistry.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiAliasRegistry.java
@@ -20,8 +20,8 @@
import java.util.Map;
-import org.apache.geronimo.gshell.registry.AliasRegistry;
import org.apache.geronimo.gshell.command.Alias;
+import org.apache.geronimo.gshell.registry.AliasRegistry;
public class OsgiAliasRegistry {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandSupport.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandSupport.java
index c153b2f..e13940a 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandSupport.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandSupport.java
@@ -18,18 +18,18 @@
*/
package org.apache.servicemix.kernel.gshell.core;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.osgi.context.BundleContextAware;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.springframework.osgi.context.BundleContextAware;
public abstract class OsgiCommandSupport implements CommandAction, BundleContextAware {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/WorkAroundAliasCommand.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/WorkAroundAliasCommand.java
index 1b2d05c..1e52177 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/WorkAroundAliasCommand.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/WorkAroundAliasCommand.java
@@ -16,20 +16,20 @@
*/
package org.apache.servicemix.kernel.gshell.core;
-import java.util.List;
import java.util.Iterator;
+import java.util.List;
-import org.apache.geronimo.gshell.wisdom.command.AliasCommand;
-import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
+import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
-import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.command.CommandResult;
-import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.shell.ShellContextHolder;
-import org.apache.geronimo.gshell.shell.ShellContext;
-import org.apache.geronimo.gshell.shell.Shell;
+import org.apache.geronimo.gshell.command.Variables;
+import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
import org.apache.geronimo.gshell.io.IO;
+import org.apache.geronimo.gshell.shell.Shell;
+import org.apache.geronimo.gshell.shell.ShellContext;
+import org.apache.geronimo.gshell.shell.ShellContextHolder;
+import org.apache.geronimo.gshell.wisdom.command.AliasCommand;
public class WorkAroundAliasCommand extends AliasCommand {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.java
index 0700974..8f3b580 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.java
@@ -18,30 +18,26 @@
*/
package org.apache.servicemix.kernel.gshell.core.commands;
-import java.lang.management.ThreadMXBean;
-import java.lang.management.OperatingSystemMXBean;
import java.lang.management.ClassLoadingMXBean;
+import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
+import java.lang.management.OperatingSystemMXBean;
import java.lang.management.RuntimeMXBean;
-import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ThreadMXBean;
import java.lang.reflect.Method;
-import java.text.NumberFormat;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
import java.util.Locale;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.geronimo.gshell.ansi.AnsiRenderer;
import org.apache.geronimo.gshell.ansi.AnsiCode;
-import org.apache.geronimo.gshell.application.model.Branding;
+import org.apache.geronimo.gshell.ansi.AnsiRenderer;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
import org.apache.geronimo.gshell.io.IO;
-import org.codehaus.plexus.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.apache.servicemix.kernel.gshell.core.ServiceMixBranding;
+import org.codehaus.plexus.util.StringUtils;
public class InfoAction implements CommandAction {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/CommandParser.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/CommandParser.java
index 61f3e6e..45d9d7d 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/CommandParser.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/CommandParser.java
@@ -18,36 +18,33 @@
*/
package org.apache.servicemix.kernel.gshell.core.config;
-import java.util.List;
-import java.util.Map;
-import java.util.LinkedHashMap;
import java.util.ArrayList;
+import java.util.List;
import org.w3c.dom.Element;
-import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedList;
-import org.springframework.beans.factory.support.ManagedMap;
-import org.springframework.beans.factory.support.GenericBeanDefinition;
-import org.springframework.beans.factory.config.BeanDefinitionHolder;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.util.StringUtils;
-import org.springframework.util.xml.DomUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.geronimo.gshell.command.Alias;
+import org.apache.geronimo.gshell.command.Link;
+import org.apache.geronimo.gshell.wisdom.command.AliasImpl;
import org.apache.geronimo.gshell.wisdom.command.ConfigurableCommandCompleter;
import org.apache.geronimo.gshell.wisdom.command.LinkImpl;
-import org.apache.geronimo.gshell.wisdom.command.AliasImpl;
import org.apache.geronimo.gshell.wisdom.registry.CommandLocationImpl;
-import org.apache.geronimo.gshell.command.Link;
-import org.apache.geronimo.gshell.command.Alias;
import org.apache.servicemix.kernel.gshell.core.CommandBundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.GenericBeanDefinition;
+import org.springframework.beans.factory.support.ManagedList;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.util.StringUtils;
+import org.springframework.util.xml.DomUtils;
public class CommandParser extends AbstractBeanDefinitionParser {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileObject.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileObject.java
index ae6d8a3..41a2bb8 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileObject.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileObject.java
@@ -18,14 +18,14 @@
*/
package org.apache.servicemix.kernel.gshell.core.vfs.mvn;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
import org.apache.commons.httpclient.URIException;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.provider.url.UrlFileObject;
import org.apache.commons.vfs.provider.URLFileName;
+import org.apache.commons.vfs.provider.url.UrlFileObject;
public class MvnFileObject extends UrlFileObject {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileProvider.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileProvider.java
index 76ae126..7d88cd6 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileProvider.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileProvider.java
@@ -18,14 +18,14 @@
*/
package org.apache.servicemix.kernel.gshell.core.vfs.mvn;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
+import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs.FileSystem;
import org.apache.commons.vfs.FileSystemException;
import org.apache.commons.vfs.FileSystemOptions;
-import org.apache.commons.vfs.FileSystem;
-import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.provider.url.UrlFileProvider;
public class MvnFileProvider extends UrlFileProvider {
diff --git a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileSystem.java b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileSystem.java
index e27b34c..7583eb5 100644
--- a/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileSystem.java
+++ b/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileSystem.java
@@ -19,8 +19,8 @@
package org.apache.servicemix.kernel.gshell.core.vfs.mvn;
import org.apache.commons.vfs.FileName;
-import org.apache.commons.vfs.FileSystemOptions;
import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs.FileSystemOptions;
import org.apache.commons.vfs.provider.url.UrlFileSystem;
public class MvnFileSystem extends UrlFileSystem {
diff --git a/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/gshell/core/Test.java b/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/gshell/core/Test.java
index cb4cddc..0983b12 100644
--- a/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/gshell/core/Test.java
+++ b/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/gshell/core/Test.java
@@ -17,11 +17,9 @@
package org.apache.servicemix.kernel.gshell.core;
import junit.framework.TestCase;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.application.ApplicationManager;
-import org.apache.geronimo.gshell.io.SystemOutputHijacker;
-import org.apache.servicemix.kernel.gshell.core.ServiceMixBranding;
+import org.apache.geronimo.gshell.shell.Shell;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
public class Test extends TestCase {
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/Repository.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/Repository.java
index 4cd0069..2bfbc99 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/Repository.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/Repository.java
@@ -16,8 +16,6 @@
*/
package org.apache.servicemix.kernel.gshell.features;
-import java.io.IOException;
-import java.net.URL;
import java.net.URI;
/**
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.java
index c0a43c9..213e1e5 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.kernel.gshell.features.commands;
-import java.util.List;
import java.net.URI;
+import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.servicemix.kernel.gshell.features.FeaturesService;
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/FeaturesCommandSupport.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/FeaturesCommandSupport.java
index b0ff6dc..06e0636 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/FeaturesCommandSupport.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/FeaturesCommandSupport.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.kernel.gshell.features.commands;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.servicemix.kernel.gshell.features.FeaturesService;
import org.osgi.framework.ServiceReference;
public abstract class FeaturesCommandSupport extends OsgiCommandSupport {
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.java
index 0d0cbdf..fba0475 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.kernel.gshell.features.commands;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
import org.apache.geronimo.gshell.clp.Option;
+import org.apache.servicemix.kernel.gshell.features.FeaturesService;
public class ListFeaturesCommand extends FeaturesCommandSupport {
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RemoveUrlCommand.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RemoveUrlCommand.java
index e13abf2..d7e6e01 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RemoveUrlCommand.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RemoveUrlCommand.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.kernel.gshell.features.commands;
-import java.util.List;
import java.net.URI;
+import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.servicemix.kernel.gshell.features.FeaturesService;
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeatureDeploymentListener.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeatureDeploymentListener.java
index 90e8851..e4a036b 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeatureDeploymentListener.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeatureDeploymentListener.java
@@ -16,40 +16,40 @@
*/
package org.apache.servicemix.kernel.gshell.features.internal;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
-import java.io.OutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import java.util.jar.Manifest;
-import java.util.jar.JarOutputStream;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
-import java.util.Enumeration;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.net.URL;
+import java.util.Enumeration;
+import java.util.jar.JarFile;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
-import org.apache.servicemix.kernel.filemonitor.DeploymentListener;
-import org.apache.servicemix.kernel.gshell.features.Feature;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.SynchronousBundleListener;
+import org.apache.servicemix.kernel.filemonitor.DeploymentListener;
+import org.apache.servicemix.kernel.gshell.features.Feature;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.Constants;
-import org.osgi.framework.BundleContext;
-import org.springframework.osgi.context.BundleContextAware;
-import org.springframework.beans.factory.InitializingBean;
+import org.osgi.framework.SynchronousBundleListener;
import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.osgi.context.BundleContextAware;
/**
* A deployment listener able to hot deploy a feature descriptor
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeatureImpl.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeatureImpl.java
index 96c2a23..07806d3 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeatureImpl.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeatureImpl.java
@@ -22,8 +22,8 @@
import java.util.Map;
import org.apache.servicemix.kernel.gshell.features.Feature;
-import org.springframework.jmx.export.annotation.ManagedResource;
import org.springframework.jmx.export.annotation.ManagedAttribute;
+import org.springframework.jmx.export.annotation.ManagedResource;
/**
* A feature
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java
index 1547f45..6c8440c 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java
@@ -31,23 +31,23 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.kernel.gshell.features.Feature;
+import org.apache.servicemix.kernel.gshell.features.FeaturesRegistry;
import org.apache.servicemix.kernel.gshell.features.FeaturesService;
import org.apache.servicemix.kernel.gshell.features.Repository;
-import org.apache.servicemix.kernel.gshell.features.FeaturesRegistry;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.Version;
-import org.osgi.framework.BundleException;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.prefs.BackingStoreException;
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java
index e324f7e..f10d152 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java
@@ -31,15 +31,15 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import org.apache.servicemix.kernel.gshell.features.Feature;
import org.apache.servicemix.kernel.gshell.features.Repository;
-import org.xml.sax.SAXException;
-import org.springframework.jmx.export.annotation.ManagedResource;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedOperation;
+import org.springframework.jmx.export.annotation.ManagedResource;
+import org.xml.sax.SAXException;
/**
* The repository implementation.
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/DefaultNamingStrategy.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/DefaultNamingStrategy.java
index 788336f..6bee5fc 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/DefaultNamingStrategy.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/DefaultNamingStrategy.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.kernel.gshell.features.management;
-import javax.management.ObjectName;
import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
import org.apache.servicemix.kernel.gshell.features.FeaturesRegistry;
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeature.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeature.java
index 5450dca..1da589b 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeature.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeature.java
@@ -20,9 +20,9 @@
import org.apache.servicemix.kernel.gshell.features.Feature;
import org.apache.servicemix.kernel.gshell.features.FeaturesService;
-import org.springframework.jmx.export.annotation.ManagedResource;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedOperation;
+import org.springframework.jmx.export.annotation.ManagedResource;
/**
* Managed Repository MBean
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeaturesRegistry.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeaturesRegistry.java
index 03394ec..1a6b84c 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeaturesRegistry.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeaturesRegistry.java
@@ -25,9 +25,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.kernel.gshell.features.Feature;
+import org.apache.servicemix.kernel.gshell.features.FeaturesRegistry;
import org.apache.servicemix.kernel.gshell.features.FeaturesService;
import org.apache.servicemix.kernel.gshell.features.Repository;
-import org.apache.servicemix.kernel.gshell.features.FeaturesRegistry;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.jmx.export.annotation.ManagedOperation;
import org.springframework.jmx.export.annotation.ManagedResource;
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedRepository.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedRepository.java
index 6010619..2d3ae17 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedRepository.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedRepository.java
@@ -22,8 +22,8 @@
import org.apache.servicemix.kernel.gshell.features.FeaturesService;
import org.apache.servicemix.kernel.gshell.features.Repository;
import org.springframework.jmx.export.annotation.ManagedAttribute;
-import org.springframework.jmx.export.annotation.ManagedResource;
import org.springframework.jmx.export.annotation.ManagedOperation;
+import org.springframework.jmx.export.annotation.ManagedResource;
@ManagedResource(description = "Features Repository")
public class ManagedRepository {
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagementAgent.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagementAgent.java
index 2fc231d..611ec6b 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagementAgent.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagementAgent.java
@@ -16,24 +16,24 @@
*/
package org.apache.servicemix.kernel.gshell.features.management;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Set;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
+import javax.management.InstanceAlreadyExistsException;
import javax.management.JMException;
+import javax.management.MBeanServer;
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectInstance;
-import javax.management.InstanceAlreadyExistsException;
+import javax.management.ObjectName;
+import javax.management.modelmbean.InvalidTargetObjectTypeException;
import javax.management.modelmbean.ModelMBeanInfo;
import javax.management.modelmbean.RequiredModelMBean;
-import javax.management.modelmbean.InvalidTargetObjectTypeException;
-import org.springframework.jmx.export.assembler.MetadataMBeanInfoAssembler;
-import org.springframework.jmx.export.annotation.AnnotationJmxAttributeSource;
-import org.springframework.beans.factory.DisposableBean;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.jmx.export.annotation.AnnotationJmxAttributeSource;
+import org.springframework.jmx.export.assembler.MetadataMBeanInfoAssembler;
/**
* Management Agent that registers MBeans with JMX MBeanServer.
diff --git a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/NamingStrategy.java b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/NamingStrategy.java
index 6be5af8..7a03399 100644
--- a/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/NamingStrategy.java
+++ b/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/NamingStrategy.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.kernel.gshell.features.management;
-import javax.management.ObjectName;
import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
import org.apache.servicemix.kernel.gshell.features.FeaturesRegistry;
diff --git a/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeatureTest.java b/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeatureTest.java
index 104b730..97d6332 100644
--- a/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeatureTest.java
+++ b/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeatureTest.java
@@ -16,9 +16,8 @@
*/
package org.apache.servicemix.kernel.gshell.features;
-import org.apache.servicemix.kernel.gshell.features.internal.FeatureImpl;
-
import junit.framework.TestCase;
+import org.apache.servicemix.kernel.gshell.features.internal.FeatureImpl;
public class FeatureTest extends TestCase {
diff --git a/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java b/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java
index 509d1c1..e301c7d 100644
--- a/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java
+++ b/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java
@@ -16,25 +16,27 @@
*/
package org.apache.servicemix.kernel.gshell.features;
-import java.net.URI;
-import java.io.InputStream;
import java.io.File;
import java.io.FileWriter;
+import java.io.InputStream;
import java.io.PrintWriter;
+import java.net.URI;
-import static org.easymock.EasyMock.*;
-
+import junit.framework.TestCase;
import org.apache.servicemix.kernel.gshell.features.internal.FeatureImpl;
import org.apache.servicemix.kernel.gshell.features.internal.FeaturesServiceImpl;
-import org.apache.servicemix.kernel.gshell.features.FeaturesRegistry;
import org.apache.servicemix.kernel.gshell.features.management.ManagedFeaturesRegistry;
import org.easymock.EasyMock;
-import org.osgi.service.prefs.PreferencesService;
-import org.osgi.service.prefs.Preferences;
-import org.osgi.framework.BundleContext;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
+import static org.easymock.EasyMock.verify;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.prefs.Preferences;
+import org.osgi.service.prefs.PreferencesService;
import org.springframework.context.ApplicationContext;
-import junit.framework.TestCase;
public class FeaturesServiceTest extends TestCase {
diff --git a/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java b/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java
index 1f0a4ae..929e0e8 100644
--- a/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java
+++ b/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java
@@ -18,9 +18,9 @@
import java.net.URI;
+import junit.framework.TestCase;
import org.apache.servicemix.kernel.gshell.features.internal.FeatureImpl;
import org.apache.servicemix.kernel.gshell.features.internal.RepositoryImpl;
-import junit.framework.TestCase;
public class RepositoryTest extends TestCase {
diff --git a/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImplTest.java b/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImplTest.java
index 113e66c..8ee87de 100644
--- a/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImplTest.java
+++ b/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImplTest.java
@@ -19,9 +19,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.servicemix.kernel.gshell.features.Feature;
-
import junit.framework.TestCase;
+import org.apache.servicemix.kernel.gshell.features.Feature;
/**
* Test cases for {@link FeaturesServiceImpl}
diff --git a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayException.java b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayException.java
index cb50a50..917e01c 100644
--- a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayException.java
+++ b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayException.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.kernel.gshell.log;
-import org.ops4j.pax.logging.spi.PaxLoggingEvent;
import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.ops4j.pax.logging.spi.PaxLoggingEvent;
public class DisplayException extends OsgiCommandSupport {
diff --git a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayLog.java b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayLog.java
index f2e2099..3beff07 100644
--- a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayLog.java
+++ b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayLog.java
@@ -17,9 +17,9 @@
package org.apache.servicemix.kernel.gshell.log;
import org.apache.geronimo.gshell.clp.Option;
+import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
import org.apache.servicemix.kernel.gshell.log.layout.PatternConverter;
import org.apache.servicemix.kernel.gshell.log.layout.PatternParser;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
/**
diff --git a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/GetLogLevel.java b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/GetLogLevel.java
index e8b41cd..cf93797 100644
--- a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/GetLogLevel.java
+++ b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/GetLogLevel.java
@@ -16,17 +16,16 @@
*/
package org.apache.servicemix.kernel.gshell.log;
-import java.util.List;
import java.util.Dictionary;
+import java.util.Enumeration;
import java.util.Map;
import java.util.TreeMap;
-import java.util.Enumeration;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
/**
* Get the log level for a given logger
diff --git a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java
index b0d5b11..a214a17 100644
--- a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java
+++ b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java
@@ -18,9 +18,6 @@
*/
package org.apache.servicemix.kernel.gshell.log;
-import java.util.AbstractList;
-import java.util.List;
-import java.util.ArrayList;
import java.util.Arrays;
/**
diff --git a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java
index a2adae6..7da0f7f 100644
--- a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java
+++ b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java
@@ -20,9 +20,9 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.cm.Configuration;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
/**
* Set the log level for a given logger
diff --git a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java
index 0e10616..03b81ff 100644
--- a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java
+++ b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java
@@ -16,12 +16,12 @@
*/
package org.apache.servicemix.kernel.gshell.log.layout;
-import java.util.Date;
-import java.util.Calendar;
-import java.util.TimeZone;
+import java.text.DateFormat;
import java.text.FieldPosition;
import java.text.ParsePosition;
-import java.text.DateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
/**
* Copied from log4j
diff --git a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java
index 7db1721..0412ac8 100644
--- a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java
+++ b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java
@@ -16,12 +16,12 @@
*/
package org.apache.servicemix.kernel.gshell.log.layout;
-import java.util.Calendar;
-import java.util.TimeZone;
-import java.util.Date;
+import java.text.DateFormatSymbols;
import java.text.FieldPosition;
import java.text.ParsePosition;
-import java.text.DateFormatSymbols;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
/**
* Copied from log4j
diff --git a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java
index 9f49c8c..f19b8bd 100644
--- a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java
+++ b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java
@@ -16,11 +16,11 @@
*/
package org.apache.servicemix.kernel.gshell.log.layout;
-import java.util.Calendar;
-import java.util.TimeZone;
-import java.util.Date;
import java.text.FieldPosition;
import java.text.ParsePosition;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
/**
* Copied from log4j
diff --git a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java
index 01cfd3f..4a74fd1 100644
--- a/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java
+++ b/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java
@@ -16,15 +16,14 @@
*/
package org.apache.servicemix.kernel.gshell.log.layout;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.LocationInfo;
-import org.ops4j.pax.logging.spi.PaxLoggingEvent;
-import org.ops4j.pax.logging.spi.PaxLocationInfo;
-
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+import org.apache.log4j.spi.LoggingEvent;
+import org.ops4j.pax.logging.spi.PaxLocationInfo;
+import org.ops4j.pax.logging.spi.PaxLoggingEvent;
+
/**
* Copied from log4j
*/
diff --git a/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java b/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java
index 33851f6..344e592 100644
--- a/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java
+++ b/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java
@@ -18,18 +18,18 @@
*/
package org.apache.servicemix.kernel.gshell.obr;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
import java.net.URL;
import java.net.URLConnection;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
-import java.io.PrintWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.BufferedOutputStream;
public class FileUtil
{
diff --git a/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java b/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java
index a79fa23..dd6af1a 100644
--- a/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java
+++ b/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java
@@ -19,6 +19,7 @@
import java.io.PrintWriter;
import java.util.List;
+import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
@@ -26,7 +27,6 @@
import org.osgi.service.obr.Requirement;
import org.osgi.service.obr.Resolver;
import org.osgi.service.obr.Resource;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
public abstract class ObrCommandSupport extends OsgiCommandSupport {
diff --git a/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java b/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java
index 0ab633d..f15db46 100644
--- a/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java
+++ b/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java
@@ -16,7 +16,6 @@
*/
package org.apache.servicemix.kernel.gshell.obr;
-import java.io.File;
import java.net.URL;
import java.util.List;
diff --git a/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleCommand.java b/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleCommand.java
index 72eda90..5a3fd3f 100644
--- a/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleCommand.java
+++ b/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleCommand.java
@@ -21,7 +21,6 @@
import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.startlevel.*;
import org.osgi.service.startlevel.StartLevel;
public abstract class BundleCommand extends OsgiCommandSupport {
diff --git a/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListBundles.java b/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListBundles.java
index 5fb9d3e..00604f3 100644
--- a/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListBundles.java
+++ b/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListBundles.java
@@ -21,9 +21,8 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.startlevel.StartLevel;
import org.osgi.service.packageadmin.PackageAdmin;
-import org.springframework.util.StringUtils;
+import org.osgi.service.startlevel.StartLevel;
public class ListBundles extends OsgiCommandSupport {
diff --git a/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/SpringApplicationListener.java b/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/SpringApplicationListener.java
index 058c2fd..92c9727 100644
--- a/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/SpringApplicationListener.java
+++ b/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/SpringApplicationListener.java
@@ -19,22 +19,22 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.springframework.osgi.context.event.OsgiBundleApplicationContextListener;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.osgi.context.BundleContextAware;
import org.springframework.osgi.context.event.OsgiBundleApplicationContextEvent;
+import org.springframework.osgi.context.event.OsgiBundleApplicationContextListener;
import org.springframework.osgi.context.event.OsgiBundleContextFailedEvent;
import org.springframework.osgi.context.event.OsgiBundleContextRefreshedEvent;
-import org.springframework.osgi.context.BundleContextAware;
import org.springframework.osgi.extender.event.BootstrappingDependencyEvent;
import org.springframework.osgi.service.importer.event.OsgiServiceDependencyEvent;
import org.springframework.osgi.service.importer.event.OsgiServiceDependencyWaitStartingEvent;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.DisposableBean;
-import org.osgi.framework.BundleListener;
-import org.osgi.framework.BundleEvent;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
public class SpringApplicationListener implements OsgiBundleApplicationContextListener,
BundleListener, BundleContextAware,
diff --git a/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartLevel.java b/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartLevel.java
index ed01214..a04a688 100644
--- a/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartLevel.java
+++ b/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartLevel.java
@@ -18,9 +18,7 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
-import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.packageadmin.PackageAdmin;
public class StartLevel extends OsgiCommandSupport {
diff --git a/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java b/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java
index 205983c..7bb15f1 100644
--- a/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java
+++ b/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java
@@ -16,15 +16,15 @@
*/
package org.apache.servicemix.kernel.gshell.packages;
-import java.util.List;
import java.io.PrintWriter;
+import java.util.List;
-import org.osgi.service.packageadmin.PackageAdmin;
-import org.osgi.service.packageadmin.ExportedPackage;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
+import org.osgi.service.packageadmin.ExportedPackage;
+import org.osgi.service.packageadmin.PackageAdmin;
public class ExportsCommand extends PackageCommandSupport {
diff --git a/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java b/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java
index 6357daf..7d109cb 100644
--- a/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java
+++ b/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java
@@ -16,17 +16,17 @@
*/
package org.apache.servicemix.kernel.gshell.packages;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.io.PrintWriter;
-import org.osgi.service.packageadmin.PackageAdmin;
-import org.osgi.service.packageadmin.ExportedPackage;
+import org.apache.geronimo.gshell.clp.Argument;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
-import org.apache.geronimo.gshell.clp.Argument;
+import org.osgi.service.packageadmin.ExportedPackage;
+import org.osgi.service.packageadmin.PackageAdmin;
public class ImportsCommand extends PackageCommandSupport {
diff --git a/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java b/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java
index 459d9e3..c570963 100644
--- a/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java
+++ b/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.servicemix.kernel.gshell.itests;
-import org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest;
-import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.commandline.CommandLineExecutionFailed;
import org.apache.geronimo.gshell.registry.NoSuchCommandException;
+import org.apache.geronimo.gshell.shell.Shell;
+import org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest;
import org.osgi.framework.Bundle;
public class CoreTest extends AbstractIntegrationTest {
diff --git a/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/jaas/boot/ProxyLoginModule.java b/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/jaas/boot/ProxyLoginModule.java
index aa90d7b..3b3aed0 100644
--- a/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/jaas/boot/ProxyLoginModule.java
+++ b/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/jaas/boot/ProxyLoginModule.java
@@ -16,16 +16,16 @@
*/
package org.apache.servicemix.kernel.jaas.boot;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
-import javax.security.auth.spi.LoginModule;
import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
/**
* An OSGi proxy login module that should be used instead of a plain reference to
diff --git a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreInstance.java b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreInstance.java
index 087ffb5..022d95b 100644
--- a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreInstance.java
+++ b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreInstance.java
@@ -25,8 +25,6 @@
import javax.net.ssl.KeyManager;
import javax.net.ssl.TrustManager;
-import org.apache.servicemix.kernel.jaas.config.KeystoreIsLocked;
-
/**
* Based on http://svn.apache.org/repos/asf/geronimo/trunk/modules/management/
* src/java/org/apache/geronimo/management/geronimo/KeystoreInstance.java
diff --git a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreManager.java b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreManager.java
index 6640d34..74fa466 100644
--- a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreManager.java
+++ b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreManager.java
@@ -18,9 +18,9 @@
import java.security.GeneralSecurityException;
+import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocketFactory;
import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.SSLContext;
/**
* Based on http://svn.apache.org/repos/asf/geronimo/trunk/modules/management/
diff --git a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Config.java b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Config.java
index 1ef6a99..7ad0b04 100644
--- a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Config.java
+++ b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Config.java
@@ -16,15 +16,15 @@
*/
package org.apache.servicemix.kernel.jaas.config.impl;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
import javax.security.auth.login.AppConfigurationEntry;
import org.apache.servicemix.kernel.jaas.boot.ProxyLoginModule;
import org.apache.servicemix.kernel.jaas.config.JaasRealm;
-import org.springframework.osgi.context.BundleContextAware;
import org.osgi.framework.BundleContext;
+import org.springframework.osgi.context.BundleContextAware;
/**
* An implementation of JaasRealm which is created
diff --git a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ConfigParser.java b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ConfigParser.java
index 629e582..5f8e16a 100644
--- a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ConfigParser.java
+++ b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ConfigParser.java
@@ -16,26 +16,26 @@
*/
package org.apache.servicemix.kernel.jaas.config.impl;
-import java.util.List;
-import java.util.Properties;
-import java.util.Map;
-import java.util.HashMap;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import org.w3c.dom.Element;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedList;
+import org.apache.servicemix.kernel.jaas.boot.ProxyLoginModule;
+import org.apache.servicemix.kernel.jaas.config.JaasRealm;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
-import org.springframework.util.xml.DomUtils;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.ManagedList;
+import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.osgi.service.exporter.support.OsgiServiceFactoryBean;
-import org.apache.servicemix.kernel.jaas.boot.ProxyLoginModule;
-import org.apache.servicemix.kernel.jaas.config.JaasRealm;
+import org.springframework.util.xml.DomUtils;
public class ConfigParser extends AbstractSingleBeanDefinitionParser {
diff --git a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiConfiguration.java b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiConfiguration.java
index c89db11..a2e6119 100644
--- a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiConfiguration.java
+++ b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiConfiguration.java
@@ -16,13 +16,12 @@
*/
package org.apache.servicemix.kernel.jaas.config.impl;
-import java.util.Map;
import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
-import javax.security.auth.login.Configuration;
import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
import org.apache.servicemix.kernel.jaas.config.JaasRealm;
diff --git a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiKeystoreManager.java b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiKeystoreManager.java
index 0448aa9..41135c2 100644
--- a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiKeystoreManager.java
+++ b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiKeystoreManager.java
@@ -16,19 +16,19 @@
*/
package org.apache.servicemix.kernel.jaas.config.impl;
-import java.util.Map;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
import java.security.GeneralSecurityException;
import java.security.SecureRandom;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocketFactory;
import javax.net.ssl.SSLSocketFactory;
import org.apache.servicemix.kernel.jaas.config.KeystoreInstance;
-import org.apache.servicemix.kernel.jaas.config.KeystoreManager;
import org.apache.servicemix.kernel.jaas.config.KeystoreIsLocked;
+import org.apache.servicemix.kernel.jaas.config.KeystoreManager;
/**
* Implementation of KeystoreManager
diff --git a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ProxyLoginModuleInitializer.java b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ProxyLoginModuleInitializer.java
index dd105d8..f2b8c32 100644
--- a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ProxyLoginModuleInitializer.java
+++ b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ProxyLoginModuleInitializer.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.kernel.jaas.config.impl;
-import org.osgi.framework.BundleContext;
import org.apache.servicemix.kernel.jaas.boot.ProxyLoginModule;
+import org.osgi.framework.BundleContext;
import org.springframework.osgi.context.BundleContextAware;
public class ProxyLoginModuleInitializer implements BundleContextAware {
diff --git a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstanceParser.java b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstanceParser.java
index 69d7c3d..01f3531 100644
--- a/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstanceParser.java
+++ b/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstanceParser.java
@@ -16,20 +16,16 @@
*/
package org.apache.servicemix.kernel.jaas.config.impl;
-import java.util.Map;
-import java.util.HashMap;
-
import org.w3c.dom.Element;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.apache.servicemix.kernel.jaas.config.KeystoreInstance;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.osgi.service.exporter.support.OsgiServiceFactoryBean;
-import org.apache.servicemix.kernel.jaas.config.KeystoreInstance;
-import org.apache.servicemix.kernel.jaas.boot.ProxyLoginModule;
/**
* Spring parser for a keystore instance
diff --git a/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java b/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java
index f18e870..fb282e9 100644
--- a/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java
+++ b/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java
@@ -16,26 +16,29 @@
*/
package org.apache.servicemix.kernel.jaas.config;
-import static org.easymock.EasyMock.*;
-
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Map;
import javax.security.auth.login.AppConfigurationEntry;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.osgi.context.support.BundleContextAwareProcessor;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceRegistration;
+import junit.framework.TestCase;
import org.apache.servicemix.kernel.jaas.boot.ProxyLoginModule;
import org.apache.servicemix.kernel.jaas.config.impl.Config;
import org.easymock.EasyMock;
-import junit.framework.TestCase;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.aryEq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceRegistration;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.osgi.context.support.BundleContextAwareProcessor;
public class NamespaceHandlerTest extends TestCase {
diff --git a/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java b/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java
index a422fa9..2b48eb4 100644
--- a/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java
+++ b/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java
@@ -16,26 +16,26 @@
*/
package org.apache.servicemix.kernel.jaas.modules.osgi;
-import java.util.Map;
-import java.util.Dictionary;
-import java.util.Set;
-import java.util.HashSet;
import java.io.IOException;
import java.security.Principal;
+import java.util.Dictionary;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
-import javax.security.auth.spi.LoginModule;
import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.login.FailedLoginException;
+import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.Callback;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.FailedLoginException;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
-import org.osgi.service.cm.Configuration;
-import org.apache.servicemix.kernel.jaas.modules.UserPrincipal;
import org.apache.servicemix.kernel.jaas.modules.RolePrincipal;
+import org.apache.servicemix.kernel.jaas.modules.UserPrincipal;
+import org.osgi.service.cm.Configuration;
public class OsgiConfigLoginModule implements LoginModule {
diff --git a/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java b/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java
index cf8377d..5971745 100644
--- a/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java
+++ b/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java
@@ -18,12 +18,11 @@
import java.io.File;
import java.io.IOException;
-import java.util.Enumeration;
+import java.security.Principal;
import java.util.HashSet;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.security.Principal;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
@@ -37,8 +36,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.kernel.jaas.modules.UserPrincipal;
import org.apache.servicemix.kernel.jaas.modules.RolePrincipal;
+import org.apache.servicemix.kernel.jaas.modules.UserPrincipal;
/**
* JAAS Login module for user / password, based on two properties files.
diff --git a/main/src/main/java/org/apache/servicemix/kernel/main/DefaultJDBCLock.java b/main/src/main/java/org/apache/servicemix/kernel/main/DefaultJDBCLock.java
index fdb1584..bf4bfba 100644
--- a/main/src/main/java/org/apache/servicemix/kernel/main/DefaultJDBCLock.java
+++ b/main/src/main/java/org/apache/servicemix/kernel/main/DefaultJDBCLock.java
@@ -18,7 +18,6 @@
*/
package org.apache.servicemix.kernel.main;
-import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
diff --git a/main/src/main/java/org/apache/servicemix/kernel/main/Main.java b/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
index 3d473a3..d09a033 100644
--- a/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
+++ b/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
@@ -26,6 +26,8 @@
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
+import java.security.Provider;
+import java.security.Security;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
@@ -35,20 +37,18 @@
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.concurrent.CountDownLatch;
-import java.security.Security;
-import java.security.Provider;
import org.apache.felix.framework.Felix;
import org.apache.felix.framework.cache.BundleCache;
-import org.apache.felix.framework.util.StringMap;
import org.apache.felix.framework.util.FelixConstants;
+import org.apache.felix.framework.util.StringMap;
import org.apache.servicemix.kernel.main.spi.MainService;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.framework.ServiceReference;
import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
import org.osgi.service.startlevel.StartLevel;
/**
diff --git a/main/src/main/java/org/apache/servicemix/kernel/main/SimpleFileLock.java b/main/src/main/java/org/apache/servicemix/kernel/main/SimpleFileLock.java
index e6298e5..c9791fd 100644
--- a/main/src/main/java/org/apache/servicemix/kernel/main/SimpleFileLock.java
+++ b/main/src/main/java/org/apache/servicemix/kernel/main/SimpleFileLock.java
@@ -18,9 +18,9 @@
*/
package org.apache.servicemix.kernel.main;
-import java.io.RandomAccessFile;
import java.io.File;
import java.io.IOException;
+import java.io.RandomAccessFile;
import java.nio.channels.FileLock;
import java.util.Properties;
diff --git a/main/src/main/java/org/apache/servicemix/kernel/main/Statements.java b/main/src/main/java/org/apache/servicemix/kernel/main/Statements.java
index d3d34c9..0681792 100644
--- a/main/src/main/java/org/apache/servicemix/kernel/main/Statements.java
+++ b/main/src/main/java/org/apache/servicemix/kernel/main/Statements.java
@@ -19,9 +19,8 @@
package org.apache.servicemix.kernel.main;
import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.sql.SQLException;
import java.sql.Statement;
public class Statements {
diff --git a/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java b/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java
index 83b673d..1353d3f 100644
--- a/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java
+++ b/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java
@@ -20,13 +20,13 @@
import javax.management.remote.JMXAuthenticator;
import javax.security.auth.Subject;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
public class JaasAuthenticator implements JMXAuthenticator {
diff --git a/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringDeploymentListener.java b/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringDeploymentListener.java
index 88231f4..ce0c1e0 100644
--- a/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringDeploymentListener.java
+++ b/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringDeploymentListener.java
@@ -18,24 +18,12 @@
package org.apache.servicemix.kernel.spring;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java b/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java
index 2bf6ad3..982fbc9 100644
--- a/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java
+++ b/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java
@@ -24,10 +24,10 @@
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.URL;
+import java.util.Enumeration;
+import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
-import java.util.Properties;
-import java.util.Enumeration;
import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
@@ -46,8 +46,8 @@
import javax.xml.transform.stream.StreamSource;
import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
import org.osgi.framework.Constants;
diff --git a/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringURLHandler.java b/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringURLHandler.java
index 8da1071..e9fedaf 100644
--- a/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringURLHandler.java
+++ b/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringURLHandler.java
@@ -28,7 +28,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.kernel.spring.SpringTransformer;
import org.osgi.service.url.AbstractURLStreamHandlerService;
/**
diff --git a/spring/src/test/java/org/apache/servicemix/kernel/spring/SpringDeploymentListenerTest.java b/spring/src/test/java/org/apache/servicemix/kernel/spring/SpringDeploymentListenerTest.java
index b6df2ac..38a37bb 100644
--- a/spring/src/test/java/org/apache/servicemix/kernel/spring/SpringDeploymentListenerTest.java
+++ b/spring/src/test/java/org/apache/servicemix/kernel/spring/SpringDeploymentListenerTest.java
@@ -20,8 +20,8 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.OutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
import java.util.Iterator;
import java.util.Set;
import java.util.jar.JarInputStream;
diff --git a/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java b/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java
index 8f5b2ed..dec38ae 100644
--- a/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java
+++ b/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.kernel.testing.itests;
-import javax.xml.stream.XMLInputFactory;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLInputFactory;
import javax.xml.transform.TransformerFactory;
import javax.xml.validation.SchemaFactory;
diff --git a/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java b/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java
index 6b5692d..eed2d5e 100644
--- a/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java
+++ b/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java
@@ -16,40 +16,39 @@
*/
package org.apache.servicemix.kernel.testing.support;
-import java.util.Properties;
-import java.util.Set;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.Enumeration;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Enumeration;
-import java.util.ArrayList;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.MalformedURLException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.FileNotFoundException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Constructor;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
+import java.util.Properties;
+import java.util.Set;
-import org.springframework.osgi.test.platform.FelixPlatform;
-import org.springframework.osgi.test.platform.OsgiPlatform;
-import org.springframework.util.ClassUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.felix.framework.Felix;
import org.apache.felix.framework.util.CompoundEnumeration;
import org.apache.felix.framework.util.FelixConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.kernel.main.Main;
import org.apache.servicemix.kernel.main.spi.MainService;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
-import org.osgi.framework.Constants;
+import org.springframework.osgi.test.platform.FelixPlatform;
+import org.springframework.osgi.test.platform.OsgiPlatform;
+import org.springframework.util.ClassUtils;
public class SmxKernelPlatform implements OsgiPlatform {
