You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/09/25 02:49:26 UTC
svn commit: r449535 - in /geronimo/server/trunk/modules/geronimo-jetty/src:
main/java/org/apache/geronimo/jetty/
main/java/org/apache/geronimo/jetty/connector/
main/java/org/apache/geronimo/jetty/interceptor/
main/java/org/apache/geronimo/jetty/request...
Author: djencks
Date: Sun Sep 24 17:49:25 2006
New Revision: 449535
URL: http://svn.apache.org/viewvc?view=rev&rev=449535
Log:
optimize imports.... I did this accidentally but am shocked at how badly organized the imports are
Modified:
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JAASJettyPrincipal.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyContainer.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyManagerImpl.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyServletHolder.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyServletRegistration.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebAppContext.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebContainerStatsImpl.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/NonAuthenticator.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/GeronimoSSLListener.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/JettyConnector.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/InstanceContextBeforeAfter.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/WebApplicationContextBeforeAfter.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/requestlog/JettyLogManagerImpl.java
geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java
geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/AbstractWebModuleTest.java
geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/ClassLoaderTest.java
geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/SecurityTest.java
geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/connector/HTTPConnectorTest.java
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java Sun Sep 24 17:49:25 2006
@@ -21,6 +21,7 @@
import java.security.Principal;
import java.security.cert.X509Certificate;
import java.util.HashMap;
+
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
@@ -28,7 +29,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.jetty.interceptor.SecurityContextBeforeAfter;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.realm.providers.CertificateCallbackHandler;
import org.apache.geronimo.security.realm.providers.ClearableCallbackHandler;
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JAASJettyPrincipal.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JAASJettyPrincipal.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JAASJettyPrincipal.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JAASJettyPrincipal.java Sun Sep 24 17:49:25 2006
@@ -17,7 +17,7 @@
package org.apache.geronimo.jetty;
import java.security.Principal;
-import java.util.Stack;
+
import javax.security.auth.Subject;
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyContainer.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyContainer.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyContainer.java Sun Sep 24 17:49:25 2006
@@ -17,11 +17,10 @@
package org.apache.geronimo.jetty;
+import org.apache.geronimo.management.geronimo.WebContainer;
import org.mortbay.http.HttpContext;
import org.mortbay.http.HttpListener;
import org.mortbay.http.RequestLog;
-import org.mortbay.http.UserRealm;
-import org.apache.geronimo.management.geronimo.WebContainer;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyManagerImpl.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyManagerImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyManagerImpl.java Sun Sep 24 17:49:25 2006
@@ -20,6 +20,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.AbstractName;
@@ -36,7 +37,6 @@
import org.apache.geronimo.jetty.requestlog.JettyLogManager;
import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
import org.apache.geronimo.kernel.config.EditableConfigurationManager;
import org.apache.geronimo.kernel.config.InvalidConfigException;
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java Sun Sep 24 17:49:25 2006
@@ -17,7 +17,6 @@
package org.apache.geronimo.jetty;
import java.io.IOException;
-import java.util.Collections;
import java.util.Map;
import java.util.Set;
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyServletHolder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyServletHolder.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyServletHolder.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyServletHolder.java Sun Sep 24 17:49:25 2006
@@ -20,19 +20,18 @@
import java.util.Map;
import java.util.Set;
+import javax.security.auth.Subject;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.UnavailableException;
-import javax.security.auth.Subject;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.management.Servlet;
-import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.Callers;
-
+import org.apache.geronimo.security.ContextManager;
import org.mortbay.jetty.servlet.ServletHolder;
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyServletRegistration.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyServletRegistration.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyServletRegistration.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyServletRegistration.java Sun Sep 24 17:49:25 2006
@@ -16,9 +16,7 @@
*/
package org.apache.geronimo.jetty;
-import java.util.Map;
import java.util.Set;
-import javax.security.jacc.PolicyContextException;
import org.mortbay.jetty.servlet.ServletHandler;
import org.mortbay.jetty.servlet.ServletHolder;
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebAppContext.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebAppContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebAppContext.java Sun Sep 24 17:49:25 2006
@@ -34,10 +34,10 @@
import javax.management.ObjectName;
import javax.naming.Context;
import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -58,8 +58,6 @@
import org.apache.geronimo.management.geronimo.WebModule;
import org.apache.geronimo.naming.enc.EnterpriseNamingContext;
import org.apache.geronimo.security.deploy.DefaultPrincipal;
-import org.apache.geronimo.security.jacc.RoleDesignateSource;
-import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
import org.apache.geronimo.transaction.GeronimoUserTransaction;
import org.mortbay.http.Authenticator;
import org.mortbay.http.HttpException;
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebContainerStatsImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebContainerStatsImpl.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebContainerStatsImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebContainerStatsImpl.java Sun Sep 24 17:49:25 2006
@@ -1,14 +1,14 @@
package org.apache.geronimo.jetty;
+import javax.management.j2ee.statistics.CountStatistic;
+import javax.management.j2ee.statistics.RangeStatistic;
+import javax.management.j2ee.statistics.TimeStatistic;
+
import org.apache.geronimo.management.stats.CountStatisticImpl;
import org.apache.geronimo.management.stats.RangeStatisticImpl;
import org.apache.geronimo.management.stats.StatisticImpl;
import org.apache.geronimo.management.stats.StatsImpl;
import org.apache.geronimo.management.stats.TimeStatisticImpl;
-
-import javax.management.j2ee.statistics.CountStatistic;
-import javax.management.j2ee.statistics.RangeStatistic;
-import javax.management.j2ee.statistics.TimeStatistic;
/**
* Jetty implementation of the Geronimo stats interface WebContainerStats
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/NonAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/NonAuthenticator.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/NonAuthenticator.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/NonAuthenticator.java Sun Sep 24 17:49:25 2006
@@ -1,12 +1,12 @@
package org.apache.geronimo.jetty;
+import java.io.IOException;
+import java.security.Principal;
+
import org.mortbay.http.Authenticator;
-import org.mortbay.http.UserRealm;
import org.mortbay.http.HttpRequest;
import org.mortbay.http.HttpResponse;
-
-import java.security.Principal;
-import java.io.IOException;
+import org.mortbay.http.UserRealm;
/**
* Authenticator that always denies, returning null. Useful when you need to install a default principal/subject
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/GeronimoSSLListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/GeronimoSSLListener.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/GeronimoSSLListener.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/GeronimoSSLListener.java Sun Sep 24 17:49:25 2006
@@ -16,10 +16,10 @@
*/
package org.apache.geronimo.jetty.connector;
-import org.mortbay.http.SslListener;
-import org.apache.geronimo.management.geronimo.KeystoreManager;
-
import javax.net.ssl.SSLServerSocketFactory;
+
+import org.apache.geronimo.management.geronimo.KeystoreManager;
+import org.mortbay.http.SslListener;
/**
* SSL listener that hooks into the Geronimo keystore infrastructure.
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java Sun Sep 24 17:49:25 2006
@@ -18,6 +18,7 @@
package org.apache.geronimo.jetty.connector;
import javax.net.ssl.KeyManagerFactory;
+
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/JettyConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/JettyConnector.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/JettyConnector.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/JettyConnector.java Sun Sep 24 17:49:25 2006
@@ -17,16 +17,16 @@
package org.apache.geronimo.jetty.connector;
-import java.net.UnknownHostException;
-import java.net.InetSocketAddress;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.jetty.JettyContainer;
import org.apache.geronimo.jetty.JettyWebConnector;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.mortbay.http.HttpListener;
import org.mortbay.http.SocketListener;
import org.mortbay.http.ajp.AJP13Listener;
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/InstanceContextBeforeAfter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/InstanceContextBeforeAfter.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/InstanceContextBeforeAfter.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/InstanceContextBeforeAfter.java Sun Sep 24 17:49:25 2006
@@ -17,10 +17,11 @@
package org.apache.geronimo.jetty.interceptor;
import java.util.Set;
+
import javax.resource.ResourceException;
-import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContextImpl;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContextImpl;
import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
import org.mortbay.http.HttpRequest;
import org.mortbay.http.HttpResponse;
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java Sun Sep 24 17:49:25 2006
@@ -21,19 +21,12 @@
import java.security.AccessControlException;
import java.security.PermissionCollection;
import java.security.Principal;
+
import javax.security.auth.Subject;
import javax.security.jacc.PolicyContext;
import javax.security.jacc.WebResourcePermission;
import javax.security.jacc.WebUserDataPermission;
-import org.mortbay.http.Authenticator;
-import org.mortbay.http.HttpException;
-import org.mortbay.http.HttpRequest;
-import org.mortbay.http.HttpResponse;
-import org.mortbay.http.SecurityConstraint;
-import org.mortbay.jetty.servlet.FormAuthenticator;
-import org.mortbay.jetty.servlet.ServletHttpRequest;
-
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.common.GeronimoSecurityException;
import org.apache.geronimo.jetty.JAASJettyPrincipal;
@@ -44,6 +37,13 @@
import org.apache.geronimo.security.SubjectId;
import org.apache.geronimo.security.deploy.DefaultPrincipal;
import org.apache.geronimo.security.util.ConfigurationUtil;
+import org.mortbay.http.Authenticator;
+import org.mortbay.http.HttpException;
+import org.mortbay.http.HttpRequest;
+import org.mortbay.http.HttpResponse;
+import org.mortbay.http.SecurityConstraint;
+import org.mortbay.jetty.servlet.FormAuthenticator;
+import org.mortbay.jetty.servlet.ServletHttpRequest;
/**
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/WebApplicationContextBeforeAfter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/WebApplicationContextBeforeAfter.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/WebApplicationContextBeforeAfter.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/WebApplicationContextBeforeAfter.java Sun Sep 24 17:49:25 2006
@@ -16,10 +16,10 @@
*/
package org.apache.geronimo.jetty.interceptor;
+import org.apache.geronimo.jetty.JettyWebAppContext;
+import org.mortbay.http.HttpContext;
import org.mortbay.http.HttpRequest;
import org.mortbay.http.HttpResponse;
-import org.mortbay.http.HttpContext;
-import org.apache.geronimo.jetty.JettyWebAppContext;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/requestlog/JettyLogManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/requestlog/JettyLogManagerImpl.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/requestlog/JettyLogManagerImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/requestlog/JettyLogManagerImpl.java Sun Sep 24 17:49:25 2006
@@ -16,24 +16,29 @@
*/
package org.apache.geronimo.jetty.requestlog;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.*;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
import java.io.File;
import java.io.FilenameFilter;
import java.io.RandomAccessFile;
-import java.nio.channels.FileChannel;
-import java.nio.MappedByteBuffer;
import java.nio.CharBuffer;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
import java.nio.charset.Charset;
-import java.text.SimpleDateFormat;
import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+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.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
/**
* Jetty implementation of the WebAccessLog management interface.
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java Sun Sep 24 17:49:25 2006
@@ -19,9 +19,9 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.jetty.JettyContainer;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/AbstractWebModuleTest.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/AbstractWebModuleTest.java Sun Sep 24 17:49:25 2006
@@ -27,8 +27,6 @@
import javax.transaction.TransactionManager;
-import org.apache.geronimo.testsupport.TestSupport;
-
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
import org.apache.geronimo.connector.outbound.connectiontracking.GeronimoTransactionListener;
import org.apache.geronimo.jetty.connector.HTTPConnector;
@@ -46,6 +44,7 @@
import org.apache.geronimo.security.realm.GenericSecurityRealm;
import org.apache.geronimo.system.serverinfo.BasicServerInfo;
import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.testsupport.TestSupport;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
import org.mortbay.http.Authenticator;
import org.mortbay.jetty.servlet.FormAuthenticator;
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/ClassLoaderTest.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/ClassLoaderTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/ClassLoaderTest.java Sun Sep 24 17:49:25 2006
@@ -18,13 +18,11 @@
package org.apache.geronimo.jetty;
import java.io.File;
-import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.geronimo.testsupport.TestSupport;
-
import org.apache.geronimo.kernel.config.MultiParentClassLoader;
import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.testsupport.TestSupport;
/**
* Tests loading various classes (as classes and URL resources) with different
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/SecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/SecurityTest.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/SecurityTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/SecurityTest.java Sun Sep 24 17:49:25 2006
@@ -29,6 +29,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+
import javax.security.jacc.WebResourcePermission;
import javax.security.jacc.WebUserDataPermission;
Modified: geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/connector/HTTPConnectorTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/connector/HTTPConnectorTest.java?view=diff&rev=449535&r1=449534&r2=449535
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/connector/HTTPConnectorTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/connector/HTTPConnectorTest.java Sun Sep 24 17:49:25 2006
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.jetty.connector;
-import java.net.UnknownHostException;
import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
import junit.framework.TestCase;