aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mnutt...@apache.org
Subject svn commit: r1060469 - in /aries/trunk/jndi: jndi-url-itest/pom.xml jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java pom.xml
Date Tue, 18 Jan 2011 17:02:03 GMT
Author: mnuttall
Date: Tue Jan 18 17:02:02 2011
New Revision: 1060469

URL: http://svn.apache.org/viewvc?rev=1060469&view=rev
Log:
ARIES-527: Fix intermittent failures in jndi-url-itest

Modified:
    aries/trunk/jndi/jndi-url-itest/pom.xml
    aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
    aries/trunk/jndi/pom.xml

Modified: aries/trunk/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/pom.xml?rev=1060469&r1=1060468&r2=1060469&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest/pom.xml Tue Jan 18 17:02:02 2011
@@ -118,12 +118,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- ><dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <scope>test</scope>
-        </dependency> -->
-
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
@@ -172,6 +166,12 @@
             <scope>test</scope>
 		</dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+            
 		<dependency>
 			<groupId>org.ops4j.pax.web</groupId>
 			<artifactId>pax-web-extender-war</artifactId>
@@ -183,30 +183,12 @@
             <scope>test</scope>
 		</dependency>
 
-		<!-- <dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-jsp</artifactId>
-            <scope>test</scope>
-		</dependency> -->
-
-		<!-- <dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-            <scope>test</scope>
-		</dependency> -->
-
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.fileinstall</artifactId>
             <scope>test</scope>
 		</dependency>
         
-        <!-- ><dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.serp</artifactId>
-            <scope>test</scope>
-        </dependency> -->
-		
 		<dependency>
 			<groupId>org.apache.aries.blueprint</groupId>
 			<artifactId>org.apache.aries.blueprint</artifactId>

Modified: aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java?rev=1060469&r1=1060468&r2=1060469&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
(original)
+++ aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
Tue Jan 18 17:02:02 2011
@@ -55,7 +55,7 @@ public class JndiUrlIntegrationTest exte
     assertNotNull(bweb);
     
     // Let's see what's going on
-    printBundleStatus("Before first request");
+    /*printBundleStatus("Before first request");
 
     // We've had intermittent problems in which Jetty only seems to start after a bundle
     // receives an HTTP request. This next block is here to prevent Hudson failures. 
@@ -65,11 +65,12 @@ public class JndiUrlIntegrationTest exte
     try { 
       Thread.sleep(5000);
     } catch (InterruptedException iox) {}
-    
-    printBundleStatus ("After workaround, before test proper");
+    */
+    printBundleStatus ("Before making web request");
     
     System.out.println("In test and trying to get connection....");
     String response = getTestServletResponse();
+    System.out.println("Got response `" + response + "`");
     assertEquals("ITest servlet response wrong", "Mark.2.0.three", response);
   }
   
@@ -98,7 +99,7 @@ public class JndiUrlIntegrationTest exte
   }
   
   private String getTestServletResponse() throws IOException { 
-    HttpURLConnection conn = makeConnection("http://localhost:8080/org.apache.aries.jndi.url.itest.web/ITestServlet");
+    HttpURLConnection conn = makeConnection("http://localhost:8080/jndiUrlItest/ITestServlet");
     String response = getHTTPResponse(conn).trim();
     return response;
   }
@@ -114,32 +115,33 @@ public class JndiUrlIntegrationTest exte
         // Felix mvn url handler - do we need this?
         mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
 
-        // this is how you set the default log level when using pax
-        // logging (logProfile)
         systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
 
         // Bundles
         mavenBundle("org.eclipse.equinox", "cm"),
         mavenBundle("org.eclipse.osgi", "services"),
+        mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
 
-        mavenBundle("org.apache.felix", "org.apache.felix.fileinstall" ),
         mavenBundle("org.ops4j.pax.web", "pax-web-extender-war"),
         mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle"),
+        
         mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
         mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
-        mavenBundle("asm", "asm-all"),
         mavenBundle("org.apache.aries", "org.apache.aries.util"),
         mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi"),
         mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url"),
-        
+      
         mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.web"),
         mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.biz"),
+        mavenBundle("asm", "asm-all"),
+        
         /* For debugging, uncomment the next two lines */
-//        vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
+        // vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
+        // waitForFrameworkStartup(),
         /*
-         * For debugging, add these imports: import static
-         * org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup; import static
-         * org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
+         * For debugging, add these imports: 
+         * import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup; 
+         * import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
          */
         equinox().version("3.5.0"));
     options = updateOptions(options);

Modified: aries/trunk/jndi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/pom.xml?rev=1060469&r1=1060468&r2=1060469&view=diff
==============================================================================
--- aries/trunk/jndi/pom.xml (original)
+++ aries/trunk/jndi/pom.xml Tue Jan 18 17:02:02 2011
@@ -118,12 +118,12 @@
             <dependency>
                 <groupId>org.ops4j.pax.web</groupId>
                 <artifactId>pax-web-extender-war</artifactId>
-                <version>0.7.2</version>
+                <version>0.8.1</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.web</groupId>
                 <artifactId>pax-web-jetty-bundle</artifactId>
-                <version>0.7.2</version>
+                <version>0.8.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>



Mime
View raw message