optimized imports

diff --git a/src/catalina/org/securityfilter/realm/catalina/CatalinaRealmAdapter.java b/src/catalina/org/securityfilter/realm/catalina/CatalinaRealmAdapter.java
index 129ef0b..84a1eba 100644 (file)
--- a/src/catalina/org/securityfilter/realm/catalina/CatalinaRealmAdapter.java
+++ b/src/catalina/org/securityfilter/realm/catalina/CatalinaRealmAdapter.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/catalina/org/securityfilter/realm/catalina/CatalinaRealmAdapter.java,v 1.4 2003/02/07 10:06:50 maxcooper Exp $
- * $Revision: 1.4 $
- * $Date: 2003/02/07 10:06:50 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/catalina/org/securityfilter/realm/catalina/CatalinaRealmAdapter.java,v 1.5 2004/01/26 09:31:13 maxcooper Exp $
+ * $Revision: 1.5 $
+ * $Date: 2004/01/26 09:31:13 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -55,9 +55,7 @@
 
 package org.securityfilter.realm.catalina;
 
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleException;
-import org.apache.catalina.Realm;
+import org.apache.catalina.*;
 import org.securityfilter.realm.SecurityRealmInterface;
 
 import java.security.Principal;
@@ -66,7 +64,7 @@ import java.security.Principal;
  * CatalinaRealmAdapter - adapts a Catalina Realm for use with the securityfilter
  *
  * @author Max Cooper (max@maxcooper.com)
- * @version $Revision: 1.4 $ $Date: 2003/02/07 10:06:50 $
+ * @version $Revision: 1.5 $ $Date: 2004/01/26 09:31:13 $
  */
 public class CatalinaRealmAdapter implements SecurityRealmInterface {
    private Realm realm;

diff --git a/src/example/org/securityfilter/example/realm/catalina/TrivialCatalinaRealm.java b/src/example/org/securityfilter/example/realm/catalina/TrivialCatalinaRealm.java
index 49ec44a..a1dc36e 100644 (file)
--- a/src/example/org/securityfilter/example/realm/catalina/TrivialCatalinaRealm.java
+++ b/src/example/org/securityfilter/example/realm/catalina/TrivialCatalinaRealm.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/example/org/securityfilter/example/realm/catalina/TrivialCatalinaRealm.java,v 1.2 2003/06/09 11:26:43 maxcooper Exp $
- * $Revision: 1.2 $
- * $Date: 2003/06/09 11:26:43 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/example/org/securityfilter/example/realm/catalina/TrivialCatalinaRealm.java,v 1.3 2004/01/26 09:31:34 maxcooper Exp $
+ * $Revision: 1.3 $
+ * $Date: 2004/01/26 09:31:34 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -55,8 +55,7 @@
 
 package org.securityfilter.example.realm.catalina;
 
-import org.apache.catalina.realm.GenericPrincipal;
-import org.apache.catalina.realm.RealmBase;
+import org.apache.catalina.realm.*;
 import org.securityfilter.example.Constants;
 
 import java.security.Principal;
@@ -67,7 +66,7 @@ import java.util.ArrayList;
  * org.securityfilter.realm.catalina.CatalinaRealmAdapter adapter class.
  *
  * @author Max Cooper (max@maxcooper.com)
- * @version $Revision: 1.2 $ $Date: 2003/06/09 11:26:43 $
+ * @version $Revision: 1.3 $ $Date: 2004/01/26 09:31:34 $
  */
 public class TrivialCatalinaRealm extends RealmBase {
 

diff --git a/src/share/org/securityfilter/authenticator/FormAuthenticator.java b/src/share/org/securityfilter/authenticator/FormAuthenticator.java
index d01d1a8..cf6788e 100644 (file)
--- a/src/share/org/securityfilter/authenticator/FormAuthenticator.java
+++ b/src/share/org/securityfilter/authenticator/FormAuthenticator.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/authenticator/FormAuthenticator.java,v 1.8 2004/01/26 09:23:09 maxcooper Exp $
- * $Revision: 1.8 $
- * $Date: 2004/01/26 09:23:09 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/authenticator/FormAuthenticator.java,v 1.9 2004/01/26 09:27:29 maxcooper Exp $
+ * $Revision: 1.9 $
+ * $Date: 2004/01/26 09:27:29 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -55,10 +55,10 @@
 
 package org.securityfilter.authenticator;
 
+import org.securityfilter.authenticator.persistent.PersistentLoginManagerInterface;
 import org.securityfilter.config.SecurityConfig;
 import org.securityfilter.filter.*;
 import org.securityfilter.realm.SecurityRealmInterface;
-import org.securityfilter.authenticator.persistent.PersistentLoginManagerInterface;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.http.*;
@@ -69,7 +69,7 @@ import java.security.Principal;
  * FormAuthenticator - authenticator implementation for the FORM auth method.
  *
  * @author Max Cooper (max@maxcooper.com)
- * @version $Revision: 1.8 $ $Date: 2004/01/26 09:23:09 $
+ * @version $Revision: 1.9 $ $Date: 2004/01/26 09:27:29 $
  */
 public class FormAuthenticator implements Authenticator {
 

diff --git a/src/share/org/securityfilter/config/AuthConstraint.java b/src/share/org/securityfilter/config/AuthConstraint.java
index 5baa395..de5622d 100644 (file)
--- a/src/share/org/securityfilter/config/AuthConstraint.java
+++ b/src/share/org/securityfilter/config/AuthConstraint.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/config/AuthConstraint.java,v 1.4 2003/01/06 00:17:25 maxcooper Exp $
- * $Revision: 1.4 $
- * $Date: 2003/01/06 00:17:25 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/config/AuthConstraint.java,v 1.5 2004/01/26 09:29:56 maxcooper Exp $
+ * $Revision: 1.5 $
+ * $Date: 2004/01/26 09:29:56 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -55,16 +55,13 @@
 
 package org.securityfilter.config;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 /**
  * AuthConstraint
  *
  * @author Max Cooper (max@maxcooper.com)
- * @version $Revision: 1.4 $ $Date: 2003/01/06 00:17:25 $
+ * @version $Revision: 1.5 $ $Date: 2004/01/26 09:29:56 $
  */
 public class AuthConstraint {
    private Set roles;

diff --git a/src/share/org/securityfilter/config/SecurityConstraint.java b/src/share/org/securityfilter/config/SecurityConstraint.java
index aefd9d6..8968581 100644 (file)
--- a/src/share/org/securityfilter/config/SecurityConstraint.java
+++ b/src/share/org/securityfilter/config/SecurityConstraint.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/config/SecurityConstraint.java,v 1.5 2003/01/06 00:17:25 maxcooper Exp $
- * $Revision: 1.5 $
- * $Date: 2003/01/06 00:17:25 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/config/SecurityConstraint.java,v 1.6 2004/01/26 09:29:56 maxcooper Exp $
+ * $Revision: 1.6 $
+ * $Date: 2004/01/26 09:29:56 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -55,15 +55,14 @@
 
 package org.securityfilter.config;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 /**
  * SecurityConstraint
  *
  * @author Max Cooper (max@maxcooper.com)
  * @author Torgeir Veimo (torgeir@pobox.com)
- * @version $Revision: 1.5 $ $Date: 2003/01/06 00:17:25 $
+ * @version $Revision: 1.6 $ $Date: 2004/01/26 09:29:56 $
  */
 public class SecurityConstraint {
    private List resourceCollections;

diff --git a/src/share/org/securityfilter/filter/URLPattern.java b/src/share/org/securityfilter/filter/URLPattern.java
index 48d2304..768a787 100644 (file)
--- a/src/share/org/securityfilter/filter/URLPattern.java
+++ b/src/share/org/securityfilter/filter/URLPattern.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/URLPattern.java,v 1.5 2003/01/06 05:01:57 maxcooper Exp $
- * $Revision: 1.5 $
- * $Date: 2003/01/06 05:01:57 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/URLPattern.java,v 1.6 2004/01/26 09:30:07 maxcooper Exp $
+ * $Revision: 1.6 $
+ * $Date: 2004/01/26 09:30:07 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -55,11 +55,8 @@
 
 package org.securityfilter.filter;
 
-import org.apache.oro.text.regex.Pattern;
-import org.apache.oro.text.regex.PatternCompiler;
-import org.apache.oro.text.regex.Perl5Compiler;
-import org.securityfilter.config.SecurityConstraint;
-import org.securityfilter.config.WebResourceCollection;
+import org.apache.oro.text.regex.*;
+import org.securityfilter.config.*;
 
 /**
  * URLPattern - Contains matchable URL pattern and the associated
@@ -67,7 +64,7 @@ import org.securityfilter.config.WebResourceCollection;
  * Also supports sorting according to the Servlet Spec v2.3.
  *
  * @author Max Cooper (max@maxcooper.com)
- * @version $Revision: 1.5 $ $Date: 2003/01/06 05:01:57 $
+ * @version $Revision: 1.6 $ $Date: 2004/01/26 09:30:07 $
  */
 public class URLPattern implements Comparable {
    /**

diff --git a/src/share/org/securityfilter/filter/URLPatternFactory.java b/src/share/org/securityfilter/filter/URLPatternFactory.java
index ef7bea7..1e7ea16 100644 (file)
--- a/src/share/org/securityfilter/filter/URLPatternFactory.java
+++ b/src/share/org/securityfilter/filter/URLPatternFactory.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/URLPatternFactory.java,v 1.2 2003/01/06 00:17:25 maxcooper Exp $
- * $Revision: 1.2 $
- * $Date: 2003/01/06 00:17:25 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/URLPatternFactory.java,v 1.3 2004/01/26 09:30:07 maxcooper Exp $
+ * $Revision: 1.3 $
+ * $Date: 2004/01/26 09:30:07 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -55,17 +55,15 @@
 
 package org.securityfilter.filter;
 
-import org.apache.oro.text.regex.PatternCompiler;
-import org.apache.oro.text.regex.Perl5Compiler;
-import org.securityfilter.config.SecurityConstraint;
-import org.securityfilter.config.WebResourceCollection;
+import org.apache.oro.text.regex.*;
+import org.securityfilter.config.*;
 
 /**
  * URLPatternFactory creates URLPattern instances. It keeps a Perl5PatternCompiler to use
  * for the creation of a set of instances.
  *
  * @author Max Cooper (max@maxcooper.com)
- * @version $Revision: 1.2 $ $Date: 2003/01/06 00:17:25 $
+ * @version $Revision: 1.3 $ $Date: 2004/01/26 09:30:07 $
  */
 public class URLPatternFactory {
    protected PatternCompiler compiler;

diff --git a/src/share/org/securityfilter/filter/URLPatternMatcher.java b/src/share/org/securityfilter/filter/URLPatternMatcher.java
index e85bf9a..149adf7 100644 (file)
--- a/src/share/org/securityfilter/filter/URLPatternMatcher.java
+++ b/src/share/org/securityfilter/filter/URLPatternMatcher.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/URLPatternMatcher.java,v 1.3 2003/01/06 01:21:33 maxcooper Exp $
- * $Revision: 1.3 $
- * $Date: 2003/01/06 01:21:33 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/URLPatternMatcher.java,v 1.4 2004/01/26 09:30:07 maxcooper Exp $
+ * $Revision: 1.4 $
+ * $Date: 2004/01/26 09:30:07 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -55,8 +55,7 @@
 
 package org.securityfilter.filter;
 
-import org.apache.oro.text.regex.PatternMatcher;
-import org.apache.oro.text.regex.Perl5Matcher;
+import org.apache.oro.text.regex.*;
 
 import java.util.Collection;
 
@@ -65,7 +64,7 @@ import java.util.Collection;
  * pattern with URLPattern objects.
  *
  * @author Max Cooper (max@maxcooper.com)
- * @version $Revision: 1.3 $ $Date: 2003/01/06 01:21:33 $
+ * @version $Revision: 1.4 $ $Date: 2004/01/26 09:30:07 $
  */
 public class URLPatternMatcher {
    private PatternMatcher patternMatcher;

diff --git a/src/test/org/securityfilter/test/http/form/CookiesDisabledTest.java b/src/test/org/securityfilter/test/http/form/CookiesDisabledTest.java
index e1cff2e..66a6aba 100644 (file)
--- a/src/test/org/securityfilter/test/http/form/CookiesDisabledTest.java
+++ b/src/test/org/securityfilter/test/http/form/CookiesDisabledTest.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/test/org/securityfilter/test/http/form/CookiesDisabledTest.java,v 1.1 2003/10/27 10:32:06 maxcooper Exp $
- * $Revision: 1.1 $
- * $Date: 2003/10/27 10:32:06 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/test/org/securityfilter/test/http/form/CookiesDisabledTest.java,v 1.2 2004/01/26 09:32:33 maxcooper Exp $
+ * $Revision: 1.2 $
+ * $Date: 2004/01/26 09:32:33 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -55,14 +55,14 @@
 
 package org.securityfilter.test.http.form;
 
-import org.securityfilter.test.http.TestBase;
 import org.securityfilter.example.Constants;
+import org.securityfilter.test.http.TestBase;
 
 /**
  * CookiesDisabledTest - Test that login behavior works with cookies disabled.
  *
  * @author Max Cooper (max@maxcooper.com)
- * @version $Revision: 1.1 $ $Date: 2003/10/27 10:32:06 $
+ * @version $Revision: 1.2 $ $Date: 2004/01/26 09:32:33 $
  */
 public class CookiesDisabledTest extends TestBase {
    /**

diff --git a/src/test/org/securityfilter/test/http/form/LogoutTest.java b/src/test/org/securityfilter/test/http/form/LogoutTest.java
index 27f8040..c984c8e 100644 (file)
--- a/src/test/org/securityfilter/test/http/form/LogoutTest.java
+++ b/src/test/org/securityfilter/test/http/form/LogoutTest.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/test/org/securityfilter/test/http/form/LogoutTest.java,v 1.1 2003/06/14 14:11:44 maxcooper Exp $
- * $Revision: 1.1 $
- * $Date: 2003/06/14 14:11:44 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/test/org/securityfilter/test/http/form/LogoutTest.java,v 1.2 2004/01/26 09:32:33 maxcooper Exp $
+ * $Revision: 1.2 $
+ * $Date: 2004/01/26 09:32:33 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -55,9 +55,7 @@
 
 package org.securityfilter.test.http.form;
 
-import com.meterware.httpunit.GetMethodWebRequest;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
+import com.meterware.httpunit.*;
 import org.securityfilter.example.Constants;
 import org.securityfilter.test.http.TestBase;
 
@@ -65,7 +63,7 @@ import org.securityfilter.test.http.TestBase;
  * LogoutTest - tests the logout functionality.
  *
  * @author Max Cooper (max@maxcooper.com)
- * @version $Revision: 1.1 $ $Date: 2003/06/14 14:11:44 $
+ * @version $Revision: 1.2 $ $Date: 2004/01/26 09:32:33 $
  */
 public class LogoutTest extends TestBase {
    /**