cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r596578 - in /incubator/cxf/trunk: parent/pom.xml rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
Date Tue, 20 Nov 2007 09:03:32 GMT
Author: ningjiang
Date: Tue Nov 20 01:03:31 2007
New Revision: 596578

URL: http://svn.apache.org/viewvc?rev=596578&view=rev
Log:
Override the createBus() in AbstractCXFSpringTest.java, still set the DontClosePort flag in
IBM jdk's profile

Modified:
    incubator/cxf/trunk/parent/pom.xml
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java

Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?rev=596578&r1=596577&r2=596578&view=diff
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Tue Nov 20 01:03:31 2007
@@ -209,6 +209,7 @@
                         <includes>
                             <include>**/*Test.java</include>
                             <include>**/*TestCase.java</include>
+                            <include>**/*TestCases.java</include>
                         </includes>
                         <!-- do not exclude **/Abstract*Test.java **/Abstract*TestCase.java
-->
                         <excludes>
@@ -986,6 +987,13 @@
                                 <property>
                                     <name>spring.validation.mode</name>
                                     <value>${spring.validation.mode}</value>
+                                </property>
+                                <property>
+                                    <!-- If we close the port after a client in the same
JVM has oppened a keep-alive
+                                     connection, on some Linux's, the socket remains consumed
until
+                                     some timeout occurs.   That may cause some tests to
timeout/hang. -->
+                                    <name>org.apache.cxf.transports.http_jetty.DontClosePort</name>
+                                    <value>true</value>
                                 </property>                                
                             </systemProperties>
                         </configuration>

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java?rev=596578&r1=596577&r2=596578&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
Tue Nov 20 01:03:31 2007
@@ -19,6 +19,8 @@
 
 package org.apache.cxf.test;
 
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusException;
 import org.junit.After;
 import org.junit.Before;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -59,6 +61,16 @@
         }
         additionalSpringConfiguration(applicationContext);
         applicationContext.refresh();
+        super.setUpBus();
+    }
+    
+    @Before
+    public void setUpBus() throws Exception {
+        // override the super before method
+    }
+    
+    public Bus createBus() throws BusException {        
+        return getBean(Bus.class, "cxf");
     }
     
     @After



Mime
View raw message