You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2006/11/09 04:51:41 UTC
svn commit: r472764 - in /incubator/cxf/trunk/rt:
core/src/test/java/org/apache/cxf/wsdl11/
frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/
frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/
Author: ningjiang
Date: Wed Nov 8 19:51:40 2006
New Revision: 472764
URL: http://svn.apache.org/viewvc?view=rev&rev=472764
Log:
Fixed the SpringServletTest fail on LinuxBox issue and an Eclipse warning in WSDLServiceBuilderTest
Modified:
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/AbstractServletTest.java
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/SpringServletTest.java
Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java?view=diff&rev=472764&r1=472763&r2=472764
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java Wed Nov 8 19:51:40 2006
@@ -382,9 +382,8 @@
TypeInfo types = serviceInfo.getTypeInfo();
assertNotNull(types);
assertNotNull(types.getSchemas());
- System.out.println(types.getSchemas().size());
- // XMLStreamWriter xsw = StaxUtils.createXMLStreamWriter(System.out);
Element ele = types.getSchemas().iterator().next().getElement();
+ assertNotNull(ele);
Schema schema = EndpointReferenceUtils.getSchema(serviceInfo);
assertNotNull(schema);
}
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java?view=diff&rev=472764&r1=472763&r2=472764
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java Wed Nov 8 19:51:40 2006
@@ -253,8 +253,10 @@
public void destroy() {
String s = bus.getId();
BUS_MAP.remove(s);
-
bus.shutdown(true);
+ //clean up the defaultBus
+ new SpringBusFactory().setDefaultBus(null);
+
}
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException {
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/AbstractServletTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/AbstractServletTest.java?view=diff&rev=472764&r1=472763&r2=472764
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/AbstractServletTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/AbstractServletTest.java Wed Nov 8 19:51:40 2006
@@ -45,11 +45,15 @@
sr.newClient().getResponse("http://localhost/services/");
} catch (HttpNotFoundException e) {
// ignore, we just want to boot up the servlet
- }
-
+ }
super.setUp();
HttpUnitOptions.setExceptionsThrownOnErrorStatus(true);
+ }
+
+ public void tearDown() {
+ // clean up the BusFactory defualt bus
+ BusFactoryHelper.newInstance().setDefaultBus(null);
}
@Override
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/SpringServletTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/SpringServletTest.java?view=diff&rev=472764&r1=472763&r2=472764
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/SpringServletTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/SpringServletTest.java Wed Nov 8 19:51:40 2006
@@ -33,12 +33,11 @@
}
public void testInvokingSpringBeans() throws Exception {
- newClient();
-
+
WebRequest req = new PostMethodWebRequest("http://localhost/services/Greeter",
getClass().getResourceAsStream("/org/apache/cxf/jaxws/GreeterMessage.xml"),
"text/xml; charset=utf-8");
-
+
WebResponse response = newClient().getResponse(req);
assertEquals("text/xml", response.getContentType());