JBossWS SVN: r18445 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms and 21 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-02-28 08:34:19 -0500 (Fri, 28 Feb 2014)
New Revision: 18445
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCaseForked.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java
Log:
[JBWS-3769] Fix shared-tests and cxf-spring-tests
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.cxf.in_container_client;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -55,7 +54,6 @@
URL url = new URL("http://" + getServerHost()
+ ":8080/jaxws-cxf-in_container_client-client?path=/jaxws-cxf-in_container_client/HelloWorldService&method=" + test
+ "&helper=" + Helper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCaseForked.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCaseForked.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.cxf.jms;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -46,8 +45,7 @@
public void testServerSide() throws Exception
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-api");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("true", br.readLine());
+ assertEquals("true", IOUtils.readAndCloseStream(url.openStream()));
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.cxf.jms;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import java.util.Properties;
@@ -47,6 +45,7 @@
import org.apache.cxf.transport.jms.JMSConduit;
import org.apache.cxf.transport.jms.JNDIConfiguration;
import org.jboss.ws.common.DOMUtils;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
@@ -70,8 +69,7 @@
public void testJMSEndpointServerSide() throws Exception
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-only-deployment-test-servlet");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("true", br.readLine());
+ assertEquals("true", IOUtils.readAndCloseStream(url.openStream()));
}
public void testJMSEndpointClientSide() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.cxf.jms_http;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import java.util.Properties;
@@ -36,6 +34,7 @@
import org.apache.cxf.transport.jms.JMSConduit;
import org.apache.cxf.transport.jms.JNDIConfiguration;
import org.jboss.test.ws.jaxws.cxf.jms.HelloWorld;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
@@ -59,8 +58,7 @@
{
final String suffix = isTargetJBoss7() ? "-as7" : "";
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment-test-servlet" + suffix);
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("true", br.readLine());
+ assertEquals("true", IOUtils.readAndCloseStream(url.openStream()));
}
public void testJMSEndpointClientSide() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.cxf.webserviceref;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -30,6 +28,7 @@
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -67,9 +66,7 @@
try
{
URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String retStr = br.readLine();
- assertEquals("HelloWorld", retStr);
+ assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream()));
}
finally
{
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -58,7 +57,6 @@
URL url = new URL("http://" + getServerHost()
+ ":8080/jaxws-samples-wsse-username-client?path=/jaxws-samples-wsse-username&method=" + test
+ "&helper=" + UsernameHelper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxrpc.samples.serviceref;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -48,8 +47,6 @@
public void testServletClient() throws Exception
{
URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String retStr = br.readLine();
- assertEquals("HelloWorld", retStr);
+ assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream()));
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.clientConfig;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -129,7 +128,6 @@
URL url = new URL("http://" + getServerHost()
+ ":8080/jaxws-clientConfig-inContainer-client?path=/jaxws-clientConfig/EndpointImpl&method=" + test
+ "&helper=" + Helper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.clientConfig;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -84,7 +83,6 @@
URL url = new URL("http://" + getServerHost()
+ ":8080/jaxws-clientConfig-inContainer-client?path=/jaxws-clientConfig/EndpointImpl&method=" + test
+ "&helper=" + Helper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.endpoint;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import javax.wsdl.Definition;
@@ -34,6 +32,7 @@
import junit.extensions.TestSetup;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -73,8 +72,7 @@
public void testServletAccess() throws Exception
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint-servlet?param=hello-world");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("hello-world", br.readLine());
+ assertEquals("hello-world", IOUtils.readAndCloseStream(url.openStream()));
}
public void testWSAccess() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.enventry;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -46,9 +45,6 @@
public void testEndpoint() throws Exception
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-enventry-servlet");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String line = br.readLine();
-
- assertEquals("web:8", line);
+ assertEquals("web:8", IOUtils.readAndCloseStream(url.openStream()));
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -29,6 +29,7 @@
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -69,5 +70,6 @@
URL jsp = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1357/hello.jsp");
HttpURLConnection conn = (HttpURLConnection) jsp.openConnection();
assertEquals(conn.getResponseCode(), 200);
+ IOUtils.readAndCloseStream(conn.getInputStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,13 +21,11 @@
*/
package org.jboss.test.ws.jaxws.jbws2307;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -45,8 +43,6 @@
public void testMTOM() throws Exception
{
- HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client/jbws2307?mtom=true").openConnection();
- BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream()));
- assertEquals("true", isr.readLine());
+ assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client/jbws2307?mtom=true").openStream()));
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,13 +21,11 @@
*/
package org.jboss.test.ws.jaxws.jbws2527;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -59,9 +57,7 @@
deploy("jaxws-jbws2527-service.war");
deploy("jaxws-jbws2527-client.war");
- HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/jaxws-jbws2527-client/jbws2527").openConnection();
- BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream()));
- assertEquals("true", isr.readLine());
+ assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-jbws2527-client/jbws2527").openStream()));
}
finally
{
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.jbws2701;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -30,6 +28,7 @@
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -51,15 +50,7 @@
public void testWSDL() throws Exception
{
URL url = new URL(endpointAddress + "?wsdl");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String line = br.readLine();
- StringBuilder sb = new StringBuilder();
- while (line != null)
- {
- sb.append(line);
- line = br.readLine();
- }
- assertTrue(sb.toString().contains("classA"));
+ assertTrue(IOUtils.readAndCloseStream(url.openStream()).contains("classA"));
}
public void testEndpoint() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,12 +21,9 @@
*/
package org.jboss.test.ws.jaxws.jbws3140;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.HttpURLConnection;
import java.net.URL;
-
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
@@ -39,8 +36,7 @@
try {
JBossWSTestHelper.deploy("jbws3140-responses-server.war");
JBossWSTestHelper.deploy("jbws3140-client.war");
- HttpURLConnection connection = (HttpURLConnection) new URL(servletClientURL + "?mtom=small").openConnection();
- String result = readConnection(connection).toString();
+ String result = IOUtils.readAndCloseStream(new URL(servletClientURL + "?mtom=small").openStream());
assertTrue("SOAPFaultException is expected but received: " + result, result.indexOf("SOAPFaultException") > -1);
String expectedDetail = "A header representing a Message Addressing Property is not valid";
assertTrue("Expected message wasn't found in response: " + result, result.indexOf(expectedDetail) > -1);
@@ -55,8 +51,7 @@
try {
JBossWSTestHelper.deploy("jbws3140-server.war");
JBossWSTestHelper.deploy("jbws3140-client.war");
- HttpURLConnection connection = (HttpURLConnection) new URL(servletClientURL + "?mtom=small").openConnection();
- String result = readConnection(connection).toString();
+ String result = IOUtils.readAndCloseStream(new URL(servletClientURL + "?mtom=small").openStream());
String expected ="--ClientMTOMEnabled--ServerMTOMEnabled--ServerAddressingEnabled--ClientAddressingEnabled";
assertTrue("Expected string wasn't found in response: " + result, result.indexOf(expected) > -1);
} finally {
@@ -64,22 +59,4 @@
JBossWSTestHelper.undeploy("jbws3140-client.war");
}
}
-
- private ByteArrayOutputStream readConnection(HttpURLConnection connection)
- {
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- byte[] buffer = new byte[1024];
- int count = 0;
- try
- {
- while( (count = connection.getInputStream().read(buffer, 0, 1024)) > -1) {
- bout.write(buffer, 0, count);
- }
- }
- catch (IOException e)
- {
- }
- return bout;
- }
-
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.jbws3223;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import javax.wsdl.Definition;
@@ -32,6 +30,7 @@
import junit.extensions.TestSetup;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -65,8 +64,7 @@
public void testServletAccess() throws Exception
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3223-servlet?param=hello-world&clCheck=true");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("hello-world", br.readLine());
+ assertEquals("hello-world", IOUtils.readAndCloseStream(url.openStream()));
}
private void readWSDL(URL wsdlURL) throws Exception
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.jbws3477;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -80,8 +79,6 @@
}
private static void runServerTest(URL url) throws Exception {
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String retStr = br.readLine();
- assertEquals("OK", retStr);
+ assertEquals("OK", IOUtils.readAndCloseStream(url.openStream()));
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,9 +21,6 @@
*/
package org.jboss.test.ws.jaxws.jbws860;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
import java.net.URL;
import javax.wsdl.Definition;
@@ -32,6 +29,7 @@
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -58,8 +56,6 @@
public void testServletAccess() throws Exception
{
- HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/test/TestServlet").openConnection();
- BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream()));
- assertEquals("Hello", isr.readLine());
+ assertEquals("Hello", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/test/TestServlet").openStream()));
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,10 +21,8 @@
*/
package org.jboss.test.ws.jaxws.samples.eardeployment;
-import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -33,6 +31,7 @@
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -106,8 +105,7 @@
if (wsdlFileDir == null)
{
URL url = new URL("http://" + getServerHost() + ":8080/earjse/support");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- wsdlFileDir = new File(br.readLine(), "wsdl");
+ wsdlFileDir = new File(IOUtils.readAndCloseStream(url.openStream()), "wsdl");
}
return wsdlFileDir;
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.samples.exception;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -72,8 +71,7 @@
URL url = new URL("http://" + getServerHost()
+ ":8080/jaxws-samples-exception-client?path=/jaxws-samples-exception-jse/ExceptionEndpointService&method=" + test
+ "&helper=" + ExceptionHelper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
private String runTestInContainerSOAP12(String test) throws Exception
@@ -81,7 +79,6 @@
URL url = new URL("http://" + getServerHost()
+ ":8080/jaxws-samples-exception-client?path=/jaxws-samples-exception-jse/SOAP12ExceptionEndpointService&method=" + test
+ "&helper=" + SOAP12ExceptionHelper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -31,6 +31,7 @@
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -56,7 +57,7 @@
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
InputStream inputStream = wsdlURL.openStream();
assertNotNull(inputStream);
- inputStream.close();
+ IOUtils.readAndCloseStream(inputStream);
}
public void testDynamicProxy() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -31,6 +31,7 @@
import junit.framework.Test;
import org.jboss.test.ws.jaxws.samples.serviceref.EJBRemote;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -55,7 +56,7 @@
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
InputStream inputStream = wsdlURL.openStream();
assertNotNull(inputStream);
- inputStream.close();
+ IOUtils.readAndCloseStream(inputStream);
}
public void testDynamicProxy() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,17 +21,18 @@
*/
package org.jboss.test.ws.jaxws.samples.serviceref;
-import junit.framework.Test;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
+import java.io.InputStream;
+import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.InputStream;
-import java.net.URL;
+import junit.framework.Test;
+
+import org.jboss.ws.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
/**
* Test the JAXWS <service-ref>
*
@@ -54,7 +55,7 @@
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
InputStream inputStream = wsdlURL.openStream();
assertNotNull(inputStream);
- inputStream.close();
+ IOUtils.readAndCloseStream(inputStream);
}
public void testDynamicProxy() throws Exception
@@ -72,9 +73,7 @@
public void testServletClient() throws Exception
{
URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String retStr = br.readLine();
- assertEquals("HelloWorld", retStr);
+ assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream()));
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.samples.webserviceref;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -30,6 +28,7 @@
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -66,9 +65,7 @@
try
{
URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String retStr = br.readLine();
- assertEquals("HelloWorld", retStr);
+ assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream()));
}
finally
{
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.samples.webservicerefsec;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -51,9 +50,7 @@
try
{
URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String retStr = br.readLine();
- assertEquals("HelloWorld", retStr);
+ assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream()));
}
finally
{
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2014-02-28 13:34:19 UTC (rev 18445)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.publish;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -46,7 +45,6 @@
public void testEndpointPublish() throws Exception
{
URL url = new URL("http://" + getServerHost() + ":8080/endpoint-publish");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("1", br.readLine());
+ assertEquals("1", IOUtils.readAndCloseStream(url.openStream()));
}
}
10 years, 2 months
- 1
- 0
JBossWS SVN: r18444 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws: cxf/clientConfig and 13 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-02-28 06:46:40 -0500 (Fri, 28 Feb 2014)
New Revision: 18444
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusReuseTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/EndorseTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPServletTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroServletTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/JaspiAuthenticationTestCase.java
Log:
[JBWS-3769] Fixing cxf-tests
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusReuseTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusReuseTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusReuseTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.cxf.bus;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.MalformedURLException;
import java.net.URL;
@@ -35,6 +33,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.stack.cxf.client.UseNewBusFeature;
import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
@@ -111,20 +110,7 @@
}
private String readWsdl(String addr) throws Exception {
- BufferedReader in = null;
- try {
- in = new BufferedReader(new InputStreamReader(new URL(addr).openStream()));
- StringBuffer sb = new StringBuffer();
- String line;
- while ((line = in.readLine()) != null) {
- sb.append(line);
- }
- return sb.toString();
- } finally {
- if (in != null) {
- in.close();
- }
- }
+ return IOUtils.readAndCloseStream(new URL(addr).openStream());
}
protected static void performInvocation(Endpoint endpoint)
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.cxf.bus;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -51,27 +50,17 @@
deploy("jaxws-cxf-bus-servlet-client.war");
try
{
-
-
URL url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testBusCreation");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String retStr = br.readLine();
- assertEquals("OK testBusCreation", retStr);
+ assertEquals("OK testBusCreation", IOUtils.readAndCloseStream(url.openStream()));
url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testSOAPConnection&host=" + getServerHost());
- br = new BufferedReader(new InputStreamReader(url.openStream()));
- retStr = br.readLine();
- assertEquals("OK testSOAPConnection", retStr);
+ assertEquals("OK testSOAPConnection", IOUtils.readAndCloseStream(url.openStream()));
url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testWebServiceRef");
- br = new BufferedReader(new InputStreamReader(url.openStream()));
- retStr = br.readLine();
- assertEquals("OK testWebServiceRef", retStr);
+ assertEquals("OK testWebServiceRef", IOUtils.readAndCloseStream(url.openStream()));
url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testWebServiceClient&host=" + getServerHost());
- br = new BufferedReader(new InputStreamReader(url.openStream()));
- retStr = br.readLine();
- assertEquals("OK testWebServiceClient", retStr);
+ assertEquals("OK testWebServiceClient", IOUtils.readAndCloseStream(url.openStream()));
}
finally
{
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.cxf.clientConfig;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -114,7 +113,6 @@
URL url = new URL("http://" + getServerHost()
+ ":8080/jaxws-cxf-clientConfig-inContainer-client?path=/jaxws-cxf-clientConfig/EndpointImpl&method=" + test
+ "&helper=" + Helper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.cxf.clientConfig;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -84,7 +83,6 @@
URL url = new URL("http://" + getServerHost()
+ ":8080/jaxws-cxf-clientConfig-inContainer-client?path=/jaxws-cxf-clientConfig/EndpointImpl&method=" + test
+ "&helper=" + Helper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/EndorseTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/EndorseTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/EndorseTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.cxf.endorse;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.stack.cxf.client.ProviderImpl;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -60,8 +59,6 @@
}
private static void runServerTest(URL url) throws Exception {
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String retStr = br.readLine();
- assertEquals("OK", retStr);
+ assertEquals("OK", IOUtils.readAndCloseStream(url.openStream()));
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPServletTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.cxf.gzip;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -79,7 +78,6 @@
URL url = new URL("http://" + getServerHost()
+ ":8080/jaxws-cxf-gzip-client?path=/jaxws-cxf-gzip/HelloWorldService/HelloWorldImpl&method=" + test
+ "&helper=" + Helper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroServletTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.cxf.jaxbintros;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -71,7 +70,6 @@
URL url = new URL("http://" + getServerHost()
+ ":8080/jaxws-cxf-jaxbintros-client?path=/jaxws-cxf-jaxbintros/EndpointService&method=" + test
+ "&helper=" + Helper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,9 +21,6 @@
*/
package org.jboss.test.ws.jaxws.cxf.jbws3516;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.net.URL;
import java.util.Map;
@@ -37,9 +34,9 @@
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
-
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -127,11 +124,6 @@
private String getTargetServletResult() throws Exception
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3516/target/result");
- InputStream ins = url.openStream();
- BufferedReader br = new BufferedReader(new InputStreamReader(ins));
- String result = br.readLine();
- br.close();
- ins.close();
- return result;
+ return IOUtils.readAndCloseStream(url.openStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.cxf.jbws3648;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -63,17 +62,7 @@
}
private void checkPolicyAttachments(URL wsdlURL, String[] refIds) throws Exception {
- BufferedReader br = new BufferedReader(new InputStreamReader(wsdlURL.openStream(), "UTF-8"));
- StringBuilder sb = new StringBuilder();
- try {
- String s;
- while ((s = br.readLine()) != null) {
- sb.append(s);
- }
- } finally {
- br.close();
- }
- String wsdl = sb.toString();
+ final String wsdl = IOUtils.readAndCloseStream(wsdlURL.openStream());
for (String refId : refIds) {
assertTrue("WSDL does not contain '" + refId + "'", wsdl.contains(refId));
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -16,12 +16,11 @@
*/
package org.jboss.test.ws.jaxws.cxf.jbws3679;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -37,10 +36,7 @@
public void testSchemaImport() throws Exception
{
URL url = new URL(endpointAddress);
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String retStr = br.readLine();
- assertEquals("Echoded with:input", retStr);
-
+ assertEquals("Echoded with:input", IOUtils.readAndCloseStream(url.openStream()));
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.cxf.jbws3713;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -30,6 +28,7 @@
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.stack.cxf.client.Constants;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -90,9 +89,7 @@
private static int callServlet(String pattern, String strategy, int threads, int calls) throws Exception {
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3713-client/" + pattern + "?strategy="
+ strategy + "&host=" + getServerHost() + "&threads=" + threads + "&calls=" + calls);
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String retStr = br.readLine();
- return Integer.parseInt(retStr);
+ return Integer.parseInt(IOUtils.readAndCloseStream(url.openStream()));
}
private HelloWs getPort(String publishURL) throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.cxf.spring;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -68,7 +67,6 @@
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-spring-client?path=/jaxws-cxf-spring/EndpointService&method="
+ test + "&helper=" + helper);
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.cxf.spring;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -53,7 +52,6 @@
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-spring-client?path=/jaxws-cxf-spring/EndpointService&method="
+ test + "&helper=" + helper);
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.cxf.udp;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.InetAddress;
import java.net.InterfaceAddress;
import java.net.NetworkInterface;
@@ -37,6 +35,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -56,8 +55,7 @@
public void testServerSide() throws Exception
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-udp-api");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("true", br.readLine());
+ assertEquals("true", IOUtils.readAndCloseStream(url.openStream()));
}
public void testClientSide() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxws.samples.mtom;
+import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.net.HttpURLConnection;
import java.net.URL;
@@ -85,10 +86,15 @@
out.close();
assertEquals(200, conn.getResponseCode());
- String response = IOUtils.readStringFromStream(conn.getInputStream());
-
- assertTrue(response.contains("--uuid"));
- assertTrue(response.contains("<return>Hello World!</return>"));
+ final InputStream is = conn.getInputStream();
+ try {
+ String response = IOUtils.readStringFromStream(is);
+
+ assertTrue(response.contains("--uuid"));
+ assertTrue(response.contains("<return>Hello World!</return>"));
+ } finally {
+ is.close();
+ }
}
public void testMtomNotUsed() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.samples.schemavalidation;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -32,6 +30,7 @@
import junit.framework.Test;
import org.jboss.test.ws.jaxws.samples.schemavalidation.types.HelloResponse;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
@@ -125,8 +124,7 @@
URL url = new URL("http://" + getServerHost()
+ ":8080/jaxws-samples-schemavalidation-client?path=/jaxws-samples-schemavalidation/hello&method=" + test
+ "&helper=" + Helper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.basic;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -33,6 +31,7 @@
import org.apache.cxf.message.Message;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.CryptoHelper;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -55,18 +54,7 @@
public void testWsdl() throws Exception
{
URL wsdlURL = new URL(serviceURL + "?wsdl");
- BufferedReader br = new BufferedReader(new InputStreamReader(wsdlURL.openStream(), "UTF-8"));
- StringBuilder sb = new StringBuilder();
- try {
- String s;
- while ((s = br.readLine()) != null) {
- sb.append(s);
- }
- } finally {
- br.close();
- }
- String wsdl = sb.toString();
- assertTrue(wsdl.contains("AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens_binding_policy"));
+ assertTrue(IOUtils.readAndCloseStream(wsdlURL.openStream()).contains("AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens_binding_policy"));
}
public void test() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.basic;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -75,7 +74,6 @@
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
"path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncryptUsingConfigProperties&helper=" + SignEncryptHelper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("1", br.readLine());
+ assertEquals("1", IOUtils.readAndCloseStream(url.openStream()));
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.basic;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -66,15 +65,13 @@
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
"path=/jaxws-samples-wsse-policy-sign-encrypt&method=testSignEncrypt&helper=" + SignEncryptHelper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("1", br.readLine());
+ assertEquals("1", IOUtils.readAndCloseStream(url.openStream()));
}
public void testServerSideUsingConfigProperties() throws Exception
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
"path=/jaxws-samples-wsse-policy-sign-encrypt&method=testSignEncryptUsingConfigProperties&helper=" + SignEncryptHelper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("1", br.readLine());
+ assertEquals("1", IOUtils.readAndCloseStream(url.openStream()));
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/JaspiAuthenticationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/JaspiAuthenticationTestCase.java 2014-02-28 11:43:44 UTC (rev 18443)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/JaspiAuthenticationTestCase.java 2014-02-28 11:46:40 UTC (rev 18444)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -37,6 +35,7 @@
import org.apache.cxf.ws.security.SecurityConstants;
import org.jboss.security.auth.login.XMLLoginConfigImpl;
+import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
@@ -159,8 +158,7 @@
URL url = new URL("http://" + getServerHost()
+ ":8080/jaxws-samples-wsse-policy-username-jaspi-client?path=/jaxws-samples-wsse-policy-username-endpoint-jaspi&method=" + test
+ "&helper=" + Helper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- return br.readLine();
+ return IOUtils.readAndCloseStream(url.openStream());
}
10 years, 2 months
- 1
- 0
JBossWS SVN: r18443 - common/trunk/src/main/java/org/jboss/ws/common.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-02-28 06:43:44 -0500 (Fri, 28 Feb 2014)
New Revision: 18443
Modified:
common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java
Log:
[JBWS-3769] Adding utility method
Modified: common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java 2014-02-27 16:23:31 UTC (rev 18442)
+++ common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java 2014-02-28 11:43:44 UTC (rev 18443)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -21,11 +21,13 @@
*/
package org.jboss.ws.common;
+import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
@@ -53,6 +55,30 @@
{
return new OutputStreamWriter(new FileOutputStream(file), charset);
}
+
+ public static String readAndCloseStream(InputStream is) throws IOException
+ {
+ return readAndCloseStream(is, "UTF-8");
+ }
+
+ public static String readAndCloseStream(InputStream is, String charsetName) throws IOException
+ {
+ final StringBuilder sb = new StringBuilder();
+ final BufferedReader br = new BufferedReader(new InputStreamReader(is, charsetName));
+ String line;
+ try
+ {
+ while ((line = br.readLine()) != null)
+ {
+ sb.append(line);
+ }
+ }
+ finally
+ {
+ br.close();
+ }
+ return sb.toString();
+ }
/** Copy the input stream to the output stream
*/
10 years, 2 months
- 1
- 0
JBossWS SVN: r18442 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-02-27 11:23:31 -0500 (Thu, 27 Feb 2014)
New Revision: 18442
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java
Log:
Avoid NPE exception in the logs due to CXF issue with wsdl retrieval of RM endpoint
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2014-02-27 15:33:16 UTC (rev 18441)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2014-02-27 16:23:31 UTC (rev 18442)
@@ -24,6 +24,7 @@
import java.net.URL;
import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import junit.framework.Test;
@@ -54,9 +55,10 @@
{
super.setUp();
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
+ URL wsdlURL = getResourceURL("jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl");
Service service = Service.create(wsdlURL, serviceName);
proxy = (SimpleService)service.getPort(SimpleService.class);
+ ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL);
}
public void test() throws Exception
10 years, 2 months
- 1
- 0
JBossWS SVN: r18441 - in stack/cxf/trunk/modules/addons/transports/http/undertow/src: test/java/org/jboss/wsf/stack/cxf/addons/transports/undertow and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-02-27 10:33:16 -0500 (Thu, 27 Feb 2014)
New Revision: 18441
Modified:
stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineFactory.java
stack/cxf/trunk/modules/addons/transports/http/undertow/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineTest.java
Log:
[JBWS-3702] Improving test (also prevents intermittent exception logging due to connection being closed before the stream is read)
Modified: stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineFactory.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineFactory.java 2014-02-26 16:57:45 UTC (rev 18440)
+++ stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineFactory.java 2014-02-27 15:33:16 UTC (rev 18441)
@@ -45,7 +45,7 @@
public class UndertowServerEngineFactory implements BusLifeCycleListener
{
private static final Logger LOG = LogUtils.getL7dLogger(UndertowServerEngineFactory.class);
- private static Map<Integer, UndertowServerEngine> portMap = new HashMap<Integer, UndertowServerEngine>();
+ private static final Map<Integer, UndertowServerEngine> portMap = new HashMap<Integer, UndertowServerEngine>();
private BusLifeCycleManager lifeCycleManager;
private Bus bus;
Modified: stack/cxf/trunk/modules/addons/transports/http/undertow/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineTest.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/undertow/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineTest.java 2014-02-26 16:57:45 UTC (rev 18440)
+++ stack/cxf/trunk/modules/addons/transports/http/undertow/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineTest.java 2014-02-27 15:33:16 UTC (rev 18441)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -23,12 +23,14 @@
import io.undertow.server.HttpServerExchange;
+import java.io.BufferedReader;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Collections;
-import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@@ -39,11 +41,9 @@
import org.apache.cxf.configuration.spring.ConfigurerImpl;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
-import org.jboss.wsf.stack.cxf.addons.transports.undertow.UndertowServerEngine;
-import org.jboss.wsf.stack.cxf.addons.transports.undertow.UndertowServerEngineFactory;
/**
- * Tests for HttpServerEngine
+ * Tests for UndertowServerEngineTest
*
* @author Magesh Kumar B <mageshbk(a)jboss.com> (C) 2011 Red Hat Inc.
* @author alessio.soldano(a)jboss.com
@@ -155,7 +155,13 @@
try
{
HttpURLConnection connection1 = (HttpURLConnection) url.openConnection();
- connection1.getInputStream();
+ StringBuilder sb = new StringBuilder();
+ BufferedReader br = new BufferedReader(new InputStreamReader(connection1.getInputStream()));
+ String line;
+ while ((line = br.readLine()) != null) {
+ sb.append(line);
+ }
+ assertEquals("Hello", sb.toString());
connection1.disconnect();
}
catch (IOException e)
10 years, 2 months
- 1
- 0
JBossWS SVN: r18440 - in stack/cxf/trunk/modules: testsuite/shared-tests/src/test/resources/jaxws/endpoint/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-02-26 11:57:45 -0500 (Wed, 26 Feb 2014)
New Revision: 18440
Modified:
stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerDestinationFactory.java
stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngine.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/endpoint/META-INF/permissions.xml
Log:
[JBWS-3702] Adding START_UNDERTOW_SERVER_ENGINE permission
Modified: stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerDestinationFactory.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerDestinationFactory.java 2014-02-26 12:18:09 UTC (rev 18439)
+++ stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerDestinationFactory.java 2014-02-26 16:57:45 UTC (rev 18440)
@@ -32,10 +32,9 @@
/**
- * Factory for HttpServerDestination
+ * Factory for UndertowServerDestination
*
* @author alessio.soldano(a)jboss.com
- * @since 22-Apr-2011
*
*/
@NoJSR250Annotations()
Modified: stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngine.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngine.java 2014-02-26 12:18:09 UTC (rev 18439)
+++ stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngine.java 2014-02-26 16:57:45 UTC (rev 18440)
@@ -21,7 +21,11 @@
*/
package org.jboss.wsf.stack.cxf.addons.transports.undertow;
+import io.undertow.server.HttpHandler;
+
import java.net.InetSocketAddress;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -29,18 +33,17 @@
import org.apache.cxf.common.logging.LogUtils;
import org.jboss.ws.undertow_httpspi.PathUtils;
import org.jboss.ws.undertow_httpspi.UndertowServer;
-import io.undertow.server.HttpHandler;
/**
- * A server engine that internally uses the JDK6 httpserver
+ * A server engine that internally uses Undertow
*
* @author alessio.soldano(a)jboss.com
* @author <a href="mailto:ema@redhat.com">Jim Ma</a>
- * @since 19-Aug-2010
*
*/
public class UndertowServerEngine
{
+ private static final RuntimePermission START_UNDERTOW_SERVER_ENGINE = new RuntimePermission("org.jboss.ws.START_UNDERTOW_SERVER_ENGINE");
private static final Logger LOG = LogUtils.getL7dLogger(UndertowServerEngine.class);
private Bus bus;
private UndertowServerEngineFactory factory;
@@ -86,7 +89,18 @@
server = new UndertowServer(isa.getPort(), isa.getHostName());
server.getPathHandler().addExactPath(PathUtils.getContextPath(address) + PathUtils.getPath(address), handler);
- server.start();
+ final SecurityManager sm = System.getSecurityManager();
+ if (sm == null) {
+ server.start();
+ } else {
+ sm.checkPermission(START_UNDERTOW_SERVER_ENGINE);
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+ server.start();
+ return null;
+ }
+ });
+ }
}
server.getPathHandler().addExactPath(PathUtils.getContextPath(address) + PathUtils.getPath(address), handler);
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/endpoint/META-INF/permissions.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/endpoint/META-INF/permissions.xml 2014-02-26 12:18:09 UTC (rev 18439)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/endpoint/META-INF/permissions.xml 2014-02-26 16:57:45 UTC (rev 18440)
@@ -13,6 +13,10 @@
<name>publishEndpoint</name>
</permission>
<permission>
+ <class-name>java.lang.RuntimePermission</class-name>
+ <name>org.jboss.ws.START_UNDERTOW_SERVER_ENGINE</name>
+ </permission>
+ <permission>
<class-name>java.net.SocketPermission</class-name>
<name>*</name>
<actions>accept,connect,listen,resolve</actions>
10 years, 2 months
- 1
- 0
JBossWS SVN: r18439 - in stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi: client and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-02-26 07:18:09 -0500 (Wed, 26 Feb 2014)
New Revision: 18439
Removed:
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/SecurityActions.java
Modified:
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/interceptor/JaspiSubjectCreatingInitInterceptor.java
Log:
[JBWS-3767] Misc minor changes
Modified: stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java
===================================================================
--- stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java 2014-02-26 12:17:10 UTC (rev 18438)
+++ stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java 2014-02-26 12:18:09 UTC (rev 18439)
@@ -73,7 +73,7 @@
}
else
{
- throw new SoapFault(e.getMessage(), new QName("", "japsi AuthException"));
+ throw new SoapFault(e.getMessage(), new QName("", "jaspi AuthException"));
}
}
Message response = null;
@@ -124,7 +124,7 @@
}
else
{
- throw new SoapFault(e.getMessage(), new QName("", "japsi AuthException"));
+ throw new SoapFault(e.getMessage(), new QName("", "jaspi AuthException"));
}
}
if (messageInfo.getResponseMessage() != null && !message.getExchange().isOneWay())
Deleted: stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/SecurityActions.java
===================================================================
--- stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/SecurityActions.java 2014-02-26 12:17:10 UTC (rev 18438)
+++ stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/SecurityActions.java 2014-02-26 12:18:09 UTC (rev 18439)
@@ -1,107 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf.jaspi.client;
-
-/**
- * @author <a href="mailto:ema@redhat.com">Jim Ma</a>
- */
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
-import org.jboss.security.SecurityContext;
-import org.jboss.security.SecurityContextAssociation;
-
-class SecurityActions
-{
- static ClassLoader getContextClassLoader()
- {
- return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
- {
- public ClassLoader run()
- {
- return Thread.currentThread().getContextClassLoader();
- }
- });
-
- }
-
- static SecurityContext getSecurityContext()
- {
- return AccessController.doPrivileged(new PrivilegedAction<SecurityContext>()
- {
-
- public SecurityContext run()
- {
- return SecurityContextAssociation.getSecurityContext();
- }
- });
- }
-
- static Class<?> loadClass(final ClassLoader cl, final String name) throws PrivilegedActionException
- {
- return AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>()
- {
- public Class<?> run() throws PrivilegedActionException
- {
- if (cl == null)
- {
- return loadClass(name);
- }
- try
- {
- return cl.loadClass(name);
- }
- catch (Exception ignore)
- {
- return loadClass(name);
- }
- }
- });
- }
-
- static Class<?> loadClass(final String name) throws PrivilegedActionException
- {
- return AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>()
- {
- public Class<?> run() throws PrivilegedActionException
- {
- try
- {
- return getClass().getClassLoader().loadClass(name);
- }
- catch (Exception ignore)
- {
- try
- {
- return getContextClassLoader().loadClass(name);
- }
- catch (Exception e)
- {
- throw new PrivilegedActionException(e);
- }
- }
- }
- });
- }
-}
\ No newline at end of file
Modified: stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java
===================================================================
--- stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java 2014-02-26 12:17:10 UTC (rev 18438)
+++ stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java 2014-02-26 12:18:09 UTC (rev 18439)
@@ -218,10 +218,8 @@
private ServerAuthModule createSAM(ClassLoader moduleCL, String name, String lmshName) throws Exception
{
Class clazz = SecurityActions.loadClass(moduleCL, name);
- Constructor ctr = clazz.getConstructor(new Class[]
- {String.class});
- return (ServerAuthModule) ctr.newInstance(new Object[]
- {lmshName});
+ Constructor ctr = clazz.getConstructor(new Class[] {String.class});
+ return (ServerAuthModule) ctr.newInstance(new Object[] {lmshName});
}
}
\ No newline at end of file
Modified: stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/interceptor/JaspiSubjectCreatingInitInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/interceptor/JaspiSubjectCreatingInitInterceptor.java 2014-02-26 12:17:10 UTC (rev 18438)
+++ stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/interceptor/JaspiSubjectCreatingInitInterceptor.java 2014-02-26 12:18:09 UTC (rev 18439)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.wsf.stack.cxf.jaspi.interceptor;
import org.apache.cxf.interceptor.Fault;
@@ -7,7 +28,7 @@
import org.jboss.security.auth.callback.JBossCallbackHandler;
import org.jboss.security.plugins.JBossAuthenticationManager;
-/*
+/**
* CXF interceptor to set jaspi JBossAuthenticationManager in message
* @author <a href="mailto:ema@redhat.com">Jim Ma</a>
*/
10 years, 2 months
- 1
- 0
JBossWS SVN: r18438 - in stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf: client/configuration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-02-26 07:17:10 -0500 (Wed, 26 Feb 2014)
New Revision: 18438
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java
Log:
[JBWS-3767] Avoid throwing/catching exception when JASPIC is not available (performance issue)
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2014-02-26 09:19:16 UTC (rev 18437)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2014-02-26 12:17:10 UTC (rev 18438)
@@ -225,7 +225,7 @@
@Message(id = 24100, value = "Could not delete wsdl directory %s")
void couldNotDeleteWsdlDirectory(String filename);
- @LogMessage(level = INFO)
- @Message(id = 24102, value = "jaspi authentication isn't enabled, can not find jaspi modules and classes")
+ @LogMessage(level = DEBUG)
+ @Message(id = 24102, value = "JASPI authentication isn't enabled, can not find JASPI modules and classes")
void cannotFindJaspiClasses();
}
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java 2014-02-26 09:19:16 UTC (rev 18437)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java 2014-02-26 12:17:10 UTC (rev 18438)
@@ -28,9 +28,8 @@
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.jaxws.DispatchImpl;
+import org.jboss.ws.api.util.ServiceLoader;
import org.jboss.ws.common.configuration.ConfigHelper;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.WSFException;
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.metadata.config.ClientConfig;
import org.jboss.wsf.spi.security.JASPIAuthenticationProvider;
@@ -64,18 +63,15 @@
setConfigProperties(cxfClient, props);
//config jaspi
- try
- {
- JASPIAuthenticationProvider japsiProvider = SPIProvider.getInstance().getSPI(JASPIAuthenticationProvider.class,
- ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader());
- if (japsiProvider != null)
- {
- japsiProvider.enableClientAuthentication(cxfClient, props);
- }
+ JASPIAuthenticationProvider japsiProvider = (JASPIAuthenticationProvider) ServiceLoader.loadService(
+ JASPIAuthenticationProvider.class.getName(), null, ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader());
+ if (japsiProvider != null)
+ {
+ japsiProvider.enableClientAuthentication(cxfClient, props);
}
- catch (WSFException e)
+ else
{
- Loggers.DEPLOYMENT_LOGGER.cannotFindJaspiClasses();
+ Loggers.SECURITY_LOGGER.cannotFindJaspiClasses();
}
}
10 years, 2 months
- 1
- 0
JBossWS SVN: r18437 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-02-26 04:19:16 -0500 (Wed, 26 Feb 2014)
New Revision: 18437
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java
Log:
Tentatively set receive timeout to 90 secs for overcoming intermittent failures on hudson
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-02-26 02:56:47 UTC (rev 18436)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-02-26 09:19:16 UTC (rev 18437)
@@ -31,6 +31,7 @@
import junit.framework.Test;
+import org.apache.cxf.message.Message;
import org.apache.cxf.ws.security.SecurityConstants;
import org.jboss.wsf.test.CryptoHelper;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
@@ -76,6 +77,7 @@
Service service = Service.create(wsdlURL, serviceName);
AnnotatedServiceIface proxy = (AnnotatedServiceIface)service.getPort(AnnotatedServiceIface.class);
setupWsse(proxy);
+ ((BindingProvider)proxy).getRequestContext().put(Message.RECEIVE_TIMEOUT, 90000);
assertEquals("Secure Hello World!", proxy.sayHello());
} catch (Exception e) {
throw CryptoHelper.checkAndWrapException(e);
10 years, 2 months
- 1
- 0
JBossWS SVN: r18436 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-02-25 21:56:47 -0500 (Tue, 25 Feb 2014)
New Revision: 18436
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Exclude jaspi testcase in as720 profile
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-02-25 17:54:28 UTC (rev 18435)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-02-26 02:56:47 UTC (rev 18436)
@@ -698,6 +698,9 @@
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
+
+ <!--There is no jbossws-cxf-jaspi installed in as720-->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Jaspi*TestCase*</exclude>
</excludes>
</configuration>
</plugin>
10 years, 2 months
- 1
- 0