Author: richard.opalka(a)jboss.com Date: 2008-02-15 07:22:14 -0500 (Fri, 15 Feb 2008) New Revision: 5699 Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java framework/trunk/version.properties Log: [JBWS-1944] refactoring Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2008-02-15 12:22:14 UTC (rev 5699) @@ -69,7 +69,7 @@ } else { - System.out.println("FIXME: [JBWS-1671] SunRI client handler cannot set mime header"); + System.out.println("FIXME: [JBWS-1671] Metro client handler cannot set mime header"); } bindingProvider.getBinding().setHandlerChain(handlerChain); @@ -85,9 +85,9 @@ Service service = Service.create(wsdlURL, serviceName); EndpointWithHandlerChain port = (EndpointWithHandlerChain)service.getPort(EndpointWithHandlerChain.class); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2008-02-15 12:22:14 UTC (rev 5699) @@ -60,9 +60,9 @@ String retStr = port.echo("hello"); StringBuffer expStr = new StringBuffer("hello"); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { @@ -81,9 +81,9 @@ expStr.append(":Outbound:LogicalJAXBHandler"); expStr.append(":Outbound:ProtocolHandler"); expStr.append(":Outbound:PortHandler"); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2008-02-15 12:22:14 UTC (rev 5699) @@ -56,9 +56,9 @@ String retStr = port.echo("hello"); StringBuffer expStr = new StringBuffer("hello"); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { @@ -77,9 +77,9 @@ expStr.append(":Outbound:LogicalSourceHandler"); expStr.append(":Outbound:ProtocolHandler"); expStr.append(":Outbound:PortHandler"); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { @@ -105,9 +105,9 @@ String retStr = port.echo("hello"); StringBuffer expStr = new StringBuffer("hello"); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { @@ -126,9 +126,9 @@ expStr.append(":Outbound:LogicalSourceHandler"); expStr.append(":Outbound:ProtocolHandler"); expStr.append(":Outbound:PortHandler"); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-02-15 12:22:14 UTC (rev 5699) @@ -72,7 +72,7 @@ public void testDataHandlerRoundtrip() throws Exception { - if(isIntegrationSunRI() && isTargetJBoss50()) + if(isIntegrationMetro() && isTargetJBoss50()) { System.out.println("FIXME JBWS-1949: Metro MTOM ignores content-type on attachment part"); return; @@ -96,7 +96,7 @@ */ public void testDataHandlerResponseOptimzed() throws Exception { - if(isIntegrationSunRI() && isTargetJBoss50()) + if(isIntegrationMetro() && isTargetJBoss50()) { System.out.println("FIXME JBWS-1949: Metro MTOM ignores content-type on attachment part"); return; Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-02-15 12:22:14 UTC (rev 5699) @@ -71,7 +71,7 @@ public void testParameterAnnotation() throws Exception { - if(isIntegrationSunRI() && isTargetJBoss50()) + if(isIntegrationMetro() && isTargetJBoss50()) { System.out.println("FIXME JBWS-1949: Metro MTOM ignores content-type on attachment part"); return; @@ -92,7 +92,7 @@ { Object content = dh.getContent(); - // SunRI returns an ByteArrayInputStream + // Metro returns an ByteArrayInputStream if (content instanceof InputStream) { BufferedReader br = new BufferedReader(new InputStreamReader((InputStream)content)); Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2008-02-15 12:22:14 UTC (rev 5699) @@ -180,7 +180,7 @@ public void testMessageStream() throws Exception { - if(isIntegrationSunRI()) + if(isIntegrationMetro()) { System.out.println("FIXME [JBWS-1777] WSProvide output is not correctly redirected"); return; Modified: framework/trunk/version.properties =================================================================== --- framework/trunk/version.properties 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/version.properties 2008-02-15 12:22:14 UTC (rev 5699) @@ -14,7 +14,7 @@ implementation.vendor.id=http://www.jboss.org # Thirdparty library versions -jbossws-common=1.0.3.GA +jbossws-common=snapshot jbossws-spi=1.0.1.GA junit=3.8.1