svn commit: r161684 - in geronimo/trunk/modules/tomcat/src: java/org/apache/geronimo/tomcat/TomcatContainer.java java/org/apache/geronimo/tomcat/TomcatWebAppContext.java test/org/apache/geronimo/tomcat/JAASSecurityTest.java

[jgenender]

Author: jgenender
Date: Sun Apr 17 12:45:29 2005
New Revision: 161684

URL: http://svn.apache.org/viewcvs?view=rev&rev=161684
Log:
Changed to spport Tomcat 5.5.9

Modified:
    
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
    
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
    
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JAASSecurityTest.java

Modified: 
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: 
http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java?view=diff&r1=161683&r2=161684
==============================================================================
--- 
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
 (original)
+++ 
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
 Sun Apr 17 12:45:29 2005
@@ -171,6 +171,7 @@
     public void doStop() throws Exception {
         if (embedded != null) {
             embedded.stop();
+            embedded.getServer().await();
             embedded = null;
         }
     }

Modified: 
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: 
http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?view=diff&r1=161683&r2=161684
==============================================================================
--- 
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
 (original)
+++ 
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
 Sun Apr 17 12:45:29 2005
@@ -19,7 +19,6 @@
 
 import java.net.URI;
 import java.net.URL;
-import java.security.PermissionCollection;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;

Modified: 
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JAASSecurityTest.java
URL: 
http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JAASSecurityTest.java?view=diff&r1=161683&r2=161684
==============================================================================
--- 
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JAASSecurityTest.java
 (original)
+++ 
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JAASSecurityTest.java
 Sun Apr 17 12:45:29 2005
@@ -150,7 +150,6 @@
     }
 
     public void testGoodAuthentication() throws Exception {
-
         Set constraints = new HashSet();
 
         SecurityConstraint sc = new SecurityConstraint();
@@ -175,6 +174,10 @@
 
         startWebApp(constraints, securityRoles);
 
+        //Give the container some time to load the web context
+        //this is wierd..it only needs to be done on this test
+        Thread.sleep(5000);       
+ 
         //Begin the test
         HttpURLConnection connection = (HttpURLConnection) new 
URL("http://localhost:8080/securetest/protected/hello.txt";).openConnection();
         connection.setInstanceFollowRedirects(false);
@@ -217,8 +220,8 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        setUpSecurity();
-    }
+        setUpSecurity();        
+   }
 
     protected void tearDown() throws Exception {
         tearDownSecurity();