servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r750809 [2/2] - in /servicemix/smx4/kernel/trunk: demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/ filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/ gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ ...
Date Fri, 06 Mar 2009 08:26:42 GMT
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java Fri Mar  6 08:26:39 2009
@@ -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;
 
 /**

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java Fri Mar  6 08:26:39 2009
@@ -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

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java Fri Mar  6 08:26:39 2009
@@ -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

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java Fri Mar  6 08:26:39 2009
@@ -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

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java Fri Mar  6 08:26:39 2009
@@ -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

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java Fri Mar  6 08:26:39 2009
@@ -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
  */

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java Fri Mar  6 08:26:39 2009
@@ -18,18 +18,18 @@
  */
 package org.apache.servicemix.kernel.gshell.obr;
 
-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.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.FileInputStream;
-import java.io.IOException;
-import java.io.BufferedOutputStream;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
 
 public class FileUtil
 {

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java Fri Mar  6 08:26:39 2009
@@ -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 {
 

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java Fri Mar  6 08:26:39 2009
@@ -16,7 +16,6 @@
  */
 package org.apache.servicemix.kernel.gshell.obr;
 
-import java.io.File;
 import java.net.URL;
 import java.util.List;
 

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleCommand.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleCommand.java Fri Mar  6 08:26:39 2009
@@ -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 {

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListBundles.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListBundles.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListBundles.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListBundles.java Fri Mar  6 08:26:39 2009
@@ -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 {
 

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/SpringApplicationListener.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/SpringApplicationListener.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/SpringApplicationListener.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/SpringApplicationListener.java Fri Mar  6 08:26:39 2009
@@ -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,

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartLevel.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartLevel.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartLevel.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartLevel.java Fri Mar  6 08:26:39 2009
@@ -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 {
 

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java Fri Mar  6 08:26:39 2009
@@ -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 {
 

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java Fri Mar  6 08:26:39 2009
@@ -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 {
 

Modified: servicemix/smx4/kernel/trunk/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java Fri Mar  6 08:26:39 2009
@@ -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 {

Modified: servicemix/smx4/kernel/trunk/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/jaas/boot/ProxyLoginModule.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/jaas/boot/ProxyLoginModule.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/jaas/boot/ProxyLoginModule.java (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/jaas/boot/ProxyLoginModule.java Fri Mar  6 08:26:39 2009
@@ -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

Modified: servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreInstance.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreInstance.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreInstance.java (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreInstance.java Fri Mar  6 08:26:39 2009
@@ -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

Modified: servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreManager.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreManager.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreManager.java (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreManager.java Fri Mar  6 08:26:39 2009
@@ -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/

Modified: servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Config.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Config.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Config.java (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Config.java Fri Mar  6 08:26:39 2009
@@ -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

Modified: servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ConfigParser.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ConfigParser.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ConfigParser.java (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ConfigParser.java Fri Mar  6 08:26:39 2009
@@ -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 {
 

Modified: servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiConfiguration.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiConfiguration.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiConfiguration.java (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiConfiguration.java Fri Mar  6 08:26:39 2009
@@ -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;
 

Modified: servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiKeystoreManager.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiKeystoreManager.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiKeystoreManager.java (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiKeystoreManager.java Fri Mar  6 08:26:39 2009
@@ -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

Modified: servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ProxyLoginModuleInitializer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ProxyLoginModuleInitializer.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ProxyLoginModuleInitializer.java (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ProxyLoginModuleInitializer.java Fri Mar  6 08:26:39 2009
@@ -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 {

Modified: servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstanceParser.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstanceParser.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstanceParser.java (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstanceParser.java Fri Mar  6 08:26:39 2009
@@ -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

Modified: servicemix/smx4/kernel/trunk/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java Fri Mar  6 08:26:39 2009
@@ -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 {
 

Modified: servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java Fri Mar  6 08:26:39 2009
@@ -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 {
 

Modified: servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java Fri Mar  6 08:26:39 2009
@@ -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.

Modified: servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/DefaultJDBCLock.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/DefaultJDBCLock.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/DefaultJDBCLock.java (original)
+++ servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/DefaultJDBCLock.java Fri Mar  6 08:26:39 2009
@@ -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;

Modified: servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java (original)
+++ servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java Fri Mar  6 08:26:39 2009
@@ -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;
 
 /**

Modified: servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/SimpleFileLock.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/SimpleFileLock.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/SimpleFileLock.java (original)
+++ servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/SimpleFileLock.java Fri Mar  6 08:26:39 2009
@@ -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;
 

Modified: servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Statements.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Statements.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Statements.java (original)
+++ servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Statements.java Fri Mar  6 08:26:39 2009
@@ -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 {

Modified: servicemix/smx4/kernel/trunk/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java (original)
+++ servicemix/smx4/kernel/trunk/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java Fri Mar  6 08:26:39 2009
@@ -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 {
 

Modified: servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringDeploymentListener.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringDeploymentListener.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringDeploymentListener.java (original)
+++ servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringDeploymentListener.java Fri Mar  6 08:26:39 2009
@@ -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;

Modified: servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java (original)
+++ servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java Fri Mar  6 08:26:39 2009
@@ -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;
 

Modified: servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringURLHandler.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringURLHandler.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringURLHandler.java (original)
+++ servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringURLHandler.java Fri Mar  6 08:26:39 2009
@@ -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;
 
 /**

Modified: servicemix/smx4/kernel/trunk/spring/src/test/java/org/apache/servicemix/kernel/spring/SpringDeploymentListenerTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/spring/src/test/java/org/apache/servicemix/kernel/spring/SpringDeploymentListenerTest.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/spring/src/test/java/org/apache/servicemix/kernel/spring/SpringDeploymentListenerTest.java (original)
+++ servicemix/smx4/kernel/trunk/spring/src/test/java/org/apache/servicemix/kernel/spring/SpringDeploymentListenerTest.java Fri Mar  6 08:26:39 2009
@@ -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;

Modified: servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java (original)
+++ servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java Fri Mar  6 08:26:39 2009
@@ -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;
 

Modified: servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java?rev=750809&r1=750808&r2=750809&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java (original)
+++ servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java Fri Mar  6 08:26:39 2009
@@ -16,40 +16,39 @@
  */
 package org.apache.servicemix.kernel.testing.support;
 
-import java.util.Properties;
-import java.util.Set;
-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.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.FileNotFoundException;
-import java.lang.reflect.Method;
 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.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 {
 



Mime
View raw message