Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BCB32200C3F for ; Tue, 14 Feb 2017 10:49:14 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BB546160B75; Tue, 14 Feb 2017 09:49:14 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3E492160B76 for ; Tue, 14 Feb 2017 10:49:12 +0100 (CET) Received: (qmail 12973 invoked by uid 500); 14 Feb 2017 09:49:10 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 10428 invoked by uid 99); 14 Feb 2017 09:49:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2017 09:49:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C82A3E042B; Tue, 14 Feb 2017 09:49:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Tue, 14 Feb 2017 09:49:33 -0000 Message-Id: In-Reply-To: <5a3d5dd07bd54c18b7b93676f5b3fbcd@git.apache.org> References: <5a3d5dd07bd54c18b7b93676f5b3fbcd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/51] [partial] cxf git commit: Remove all trailing whitespaces archived-at: Tue, 14 Feb 2017 09:49:14 -0000 http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java index 545f41a..21e8701 100644 --- a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java +++ b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java @@ -53,7 +53,7 @@ public class OutTransformWriterTest extends Assert { public void testDefaultNamespace() throws Exception { ByteArrayOutputStream os = new ByteArrayOutputStream(); XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()); - + Map outMap = new HashMap(); outMap.put("{http://testbeans.com}*", "{http://testbeans.com/v2}*"); OutTransformWriter transformWriter = new OutTransformWriter(writer, @@ -65,14 +65,14 @@ public class OutTransformWriterTest extends Assert { JAXBContext context = JAXBContext.newInstance(TestBean.class); Marshaller m = context.createMarshaller(); m.marshal(new TestBean(), transformWriter); - + String expected = "" + ""; assertEquals(expected, os.toString()); } - + @Test - public void testNamespaceConversion() throws Exception { + public void testNamespaceConversion() throws Exception { W3CDOMStreamWriter writer = new W3CDOMStreamWriter(); JAXBContext context = JAXBContext.newInstance(TestBean.class); @@ -87,21 +87,21 @@ public class OutTransformWriterTest extends Assert { false, ""); m.marshal(new TestBean(), transformWriter); - + Element el = writer.getDocument().getDocumentElement(); assertEquals("http://testbeans.com/v2", el.getNamespaceURI()); assertFalse(StringUtils.isEmpty(el.getPrefix())); - + Element el2 = DOMUtils.getFirstElement(el); assertEquals("http://testbeans.com/v3", el2.getNamespaceURI()); assertFalse(StringUtils.isEmpty(el2.getPrefix())); - + } - + @Test public void testNamespaceConversionAndDefaultNS() throws Exception { W3CDOMStreamWriter writer = new W3CDOMStreamWriter(); - + Map outMap = new HashMap(); outMap.put("{http://testbeans.com}testBean", "{http://testbeans.com/v2}testBean"); outMap.put("{http://testbeans.com}bean", "{http://testbeans.com/v3}bean"); @@ -114,16 +114,16 @@ public class OutTransformWriterTest extends Assert { JAXBContext context = JAXBContext.newInstance(TestBean.class); Marshaller m = context.createMarshaller(); m.marshal(new TestBean(), transformWriter); - + Element el = writer.getDocument().getDocumentElement(); assertEquals("http://testbeans.com/v2", el.getNamespaceURI()); assertTrue(StringUtils.isEmpty(el.getPrefix())); - + el = DOMUtils.getFirstElement(el); assertEquals("http://testbeans.com/v3", el.getNamespaceURI()); assertFalse(StringUtils.isEmpty(el.getPrefix())); } - + @XmlRootElement(name = "testBean", namespace = "http://testbeans.com") public static class TestBean { private TestBean2 bean = new TestBean2(); @@ -137,10 +137,10 @@ public class OutTransformWriterTest extends Assert { return bean; } } - + private static class TestBean2 { } - + // additional test cases @Test public void testReplaceSimpleElement() throws Exception { @@ -148,8 +148,8 @@ public class OutTransformWriterTest extends Assert { "1".getBytes()); ByteArrayOutputStream os = new ByteArrayOutputStream(); - XMLStreamWriter writer = - new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()), + XMLStreamWriter writer = + new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()), null, Collections.singletonMap("{http://bar}a", "{http://bar}a=1 2 3"), null, null, false, null); StaxUtils.copy(new StreamSource(is), writer); @@ -157,106 +157,106 @@ public class OutTransformWriterTest extends Assert { XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(os.toByteArray())); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); StaxUtils.copy(reader, bos); String value = bos.toString(); - assertEquals("1 2 3", value); + assertEquals("1 2 3", value); } @Test public void testReadWithComplexRequestSameNamespace() throws Exception { Map inMap = new HashMap(); - inMap.put("{http://cxf.apache.org/transform/header/element}*", + inMap.put("{http://cxf.apache.org/transform/header/element}*", "{http://cxf.apache.org/transform/header/element}*"); - - XMLStreamReader reader = - TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn1.xml", + + XMLStreamReader reader = + TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn1.xml", inMap, null, null, null, false, null); - - XMLStreamReader reader2 = + + XMLStreamReader reader2 = StaxUtils.createXMLStreamReader( OutTransformWriter.class.getResourceAsStream("../resources/complexReq1.xml")); TransformTestUtils.verifyReaders(reader2, reader, true, true); } - + @Test public void testReadWithComplexRequestMultipleNamespace() throws Exception { Map inMap = new HashMap(); - inMap.put("{http://cxf.apache.org/transform/header/element}*", + inMap.put("{http://cxf.apache.org/transform/header/element}*", "{http://cxf.apache.org/transform/header/otherelement}*"); - inMap.put("{http://cxf.apache.org/transform/test}*", + inMap.put("{http://cxf.apache.org/transform/test}*", "{http://cxf.apache.org/transform/othertest}*"); - - XMLStreamReader reader = - TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn2.xml", + + XMLStreamReader reader = + TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn2.xml", inMap, null, null, null, false, null); - - XMLStreamReader reader2 = + + XMLStreamReader reader2 = StaxUtils.createXMLStreamReader( InTransformReader.class.getResourceAsStream("../resources/complexReq2.xml")); TransformTestUtils.verifyReaders(reader2, reader, true, true); } - + @Test public void testReadWithComplexTransformationNamespace() throws Exception { Map inMap = new HashMap(); - inMap.put("{http://cxf.apache.org/transform/header/element}*", + inMap.put("{http://cxf.apache.org/transform/header/element}*", "{http://cxf.apache.org/transform/header/otherelement}*"); - inMap.put("{http://cxf.apache.org/transform/test}*", + inMap.put("{http://cxf.apache.org/transform/test}*", "{http://cxf.apache.org/transform/othertest}*"); - inMap.put("{http://schemas.xmlsoap.org/soap/envelope/}Envelope", + inMap.put("{http://schemas.xmlsoap.org/soap/envelope/}Envelope", "{http://schemas.xmlsoap.org/soap/envelope/}TheEnvelope"); - + // set the block original reader flag to true - XMLStreamReader reader = - TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn3.xml", + XMLStreamReader reader = + TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn3.xml", inMap, null, null, null, false, null); - XMLStreamReader reader2 = + XMLStreamReader reader2 = StaxUtils.createXMLStreamReader( - InTransformReader.class.getResourceAsStream("../resources/complexReq3.xml")); + InTransformReader.class.getResourceAsStream("../resources/complexReq3.xml")); TransformTestUtils.verifyReaders(reader2, reader, true, false); } @Test public void testReadWithComplexTransformationNamespace2() throws Exception { Map map = new HashMap(); - map.put("{http://testbeans.com/double}*", + map.put("{http://testbeans.com/double}*", "{http://testbeans.com/double/v2}*"); - map.put("{http://testbeans.com}*", + map.put("{http://testbeans.com}*", "{http://testbeans.com/v3}*"); - + // the namespaces are prefixed in the input - XMLStreamReader reader = - TransformTestUtils.createOutTransformedStreamReader("../resources/doubleBeanIn1.xml", + XMLStreamReader reader = + TransformTestUtils.createOutTransformedStreamReader("../resources/doubleBeanIn1.xml", map, null, null, null, false, null); - XMLStreamReader reader2 = + XMLStreamReader reader2 = StaxUtils.createXMLStreamReader( - InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml")); + InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml")); TransformTestUtils.verifyReaders(reader2, reader, true, false); // the child elements with the default namespace that is declared in the elements - reader = - TransformTestUtils.createOutTransformedStreamReader("../resources/doubleBeanIn2.xml", + reader = + TransformTestUtils.createOutTransformedStreamReader("../resources/doubleBeanIn2.xml", map, null, null, null, false, null); - reader2 = + reader2 = StaxUtils.createXMLStreamReader( - InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml")); + InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml")); TransformTestUtils.verifyReaders(reader2, reader, true, false); // the child elements with the default namespace that is declared in their parent element - reader = - TransformTestUtils.createOutTransformedStreamReader("../resources/doubleBeanIn3.xml", + reader = + TransformTestUtils.createOutTransformedStreamReader("../resources/doubleBeanIn3.xml", map, null, null, null, false, null); - reader2 = + reader2 = StaxUtils.createXMLStreamReader( - InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml")); + InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml")); TransformTestUtils.verifyReaders(reader2, reader, true, false); - + // writing each child separately (as the soap header children are serialized) ByteArrayOutputStream os = new ByteArrayOutputStream(); XMLStreamWriter writer = - new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()), + new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()), map, null, null, null, false, null); boolean nsset = "ns3".equals(writer.getNamespaceContext().getPrefix("http://testbeans.com/double")); @@ -267,48 +267,48 @@ public class OutTransformWriterTest extends Assert { nsset = "".equals(writer.getNamespaceContext().getPrefix("http://testbeans.com")); writer.writeStartElement("", "bean", "http://testbeans.com"); if (!nsset) { - writer.writeNamespace("", "http://testbeans.com"); + writer.writeNamespace("", "http://testbeans.com"); } writer.writeEndElement(); nsset = "".equals(writer.getNamespaceContext().getPrefix("http://testbeans.com")); writer.writeStartElement("", "beanNext", "http://testbeans.com"); if (!nsset) { - writer.writeNamespace("", "http://testbeans.com"); + writer.writeNamespace("", "http://testbeans.com"); } writer.writeEndElement(); writer.writeEndElement(); writer.flush(); - + reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(os.toByteArray())); - reader2 = + reader2 = StaxUtils.createXMLStreamReader( - InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml")); + InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml")); TransformTestUtils.verifyReaders(reader2, reader, true, false); } @Test public void testRemoveOneNamespace() throws Exception { Map inMap = new HashMap(); - inMap.put("{http://cxf.apache.org/vgop/serviceorder/v1_0}result", "result"); - XMLStreamReader reader = - TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn5.xml", + inMap.put("{http://cxf.apache.org/vgop/serviceorder/v1_0}result", "result"); + XMLStreamReader reader = + TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn5.xml", inMap, null, null, null, false, null); - - XMLStreamReader reader2 = + + XMLStreamReader reader2 = StaxUtils.createXMLStreamReader( InTransformReader.class.getResourceAsStream("../resources/complexReq5.xml")); TransformTestUtils.verifyReaders(reader2, reader, true, true); } - + @Test public void testRemoveOneDefaultNamespace() throws Exception { Map inMap = new HashMap(); - inMap.put("{http://cxf.apache.org/hello_world_soap_http/types2}requestType", "requestType"); - XMLStreamReader reader = - TransformTestUtils.createOutTransformedStreamReader("../resources/greetMe2ReqIn1.xml", + inMap.put("{http://cxf.apache.org/hello_world_soap_http/types2}requestType", "requestType"); + XMLStreamReader reader = + TransformTestUtils.createOutTransformedStreamReader("../resources/greetMe2ReqIn1.xml", inMap, null, null, null, false, null); - - XMLStreamReader reader2 = + + XMLStreamReader reader2 = StaxUtils.createXMLStreamReader( InTransformReader.class.getResourceAsStream("../resources/greetMe2Req.xml")); TransformTestUtils.verifyReaders(reader2, reader, true, true); @@ -319,11 +319,11 @@ public class OutTransformWriterTest extends Assert { Map transformElements = new HashMap(); transformElements.put("requestValue", "{http://cxf.apache.org/hello_world_soap_http/types}requestType"); - + Map appendElements = new HashMap(); appendElements.put("requestValue", "{http://cxf.apache.org/hello_world_soap_http/types}greetMe"); - TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn1.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn1.xml", "../resources/greetMeReq.xml", transformElements, appendElements, null, null, null); } @@ -335,21 +335,21 @@ public class OutTransformWriterTest extends Assert { "{http://cxf.apache.org/hello_world_soap_http/types}requestType"); transformElements.put("{http://cxf.apache.org/hello_world_soap_http/types}requestDate", ""); - + Map appendElements = new HashMap(); appendElements.put("requestValue", "{http://cxf.apache.org/hello_world_soap_http/types}greetMe"); - + List dropElements = new ArrayList<>(); dropElements.add("value"); - + Map transformAttributes = new HashMap(); transformAttributes.put("num", ""); transformAttributes.put("nombre", "{http://cxf.apache.org/hello_world_soap_http/types}name"); - - TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn2.xml", + + TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn2.xml", "../resources/greetMeReq.xml", - transformElements, appendElements, dropElements, + transformElements, appendElements, dropElements, transformAttributes, null); } @@ -359,7 +359,7 @@ public class OutTransformWriterTest extends Assert { transformElements.put("*", "{http://cxf.apache.org/hello_world_soap_http/types}*"); - TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn3.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn3.xml", "../resources/greetMeReq.xml", transformElements, null, null, null, null); } @@ -370,20 +370,20 @@ public class OutTransformWriterTest extends Assert { transformAttributes.put("{http://www.w3.org/2001/XMLSchema-instance}type", ""); - TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn4.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn4.xml", "../resources/greetMeReq.xml", null, null, null, transformAttributes, null); } - + @Test public void testReadWithAppendPreInclude1() throws Exception { Map appendElements = new HashMap(); appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId", "{http://xml.amazon.com/AWSECommerceService/2004-08-01}IdType=ASIN"); - TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn1.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn1.xml", "../resources/amazon.xml", null, appendElements, null, null, null); - + } @Test @@ -391,10 +391,10 @@ public class OutTransformWriterTest extends Assert { Map appendElements = new HashMap(); appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId", "{http://xml.amazon.com/AWSECommerceService/2004-08-01}IdType=ASIN"); - TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn1nospace.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn1nospace.xml", "../resources/amazon.xml", null, appendElements, null, null, null); - + } @Test @@ -405,7 +405,7 @@ public class OutTransformWriterTest extends Assert { Map appendElements = new HashMap(); appendElements.put("{http://apache.org/cxf/calculator/types}add", "{http://www.w3.org/2003/05/soap-envelope}Body"); - TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn2.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn2.xml", "../resources/AddRequest2.xml", transformElements, appendElements, null, null, null); } @@ -418,7 +418,7 @@ public class OutTransformWriterTest extends Assert { Map appendElements = new HashMap(); appendElements.put("{http://apache.org/cxf/calculator/types}add", "{http://www.w3.org/2003/05/soap-envelope}Body"); - TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn2nospace.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn2nospace.xml", "../resources/AddRequest2.xml", transformElements, appendElements, null, null, null); } @@ -428,10 +428,10 @@ public class OutTransformWriterTest extends Assert { Map appendElements = new HashMap(); appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}Request/", "{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId=0486411214"); - TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn2.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn2.xml", "../resources/amazon.xml", null, appendElements, null, null, null); - + } @Test @@ -439,10 +439,10 @@ public class OutTransformWriterTest extends Assert { Map appendElements = new HashMap(); appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}Request/", "{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId=0486411214"); - TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn2nospace.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn2nospace.xml", "../resources/amazon.xml", null, appendElements, null, null, null); - + } @Test @@ -450,10 +450,10 @@ public class OutTransformWriterTest extends Assert { Map appendElements = new HashMap(); appendElements.put("{http://www.w3.org/2003/05/soap-envelope}Body/", "{http://apache.org/cxf/calculator/types}add"); - TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn1.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn1.xml", "../resources/AddRequest.xml", null, appendElements, null, null, null); - + } @Test @@ -461,10 +461,10 @@ public class OutTransformWriterTest extends Assert { Map appendElements = new HashMap(); appendElements.put("{http://www.w3.org/2003/05/soap-envelope}Body/", "{http://apache.org/cxf/calculator/types}add"); - TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn1nospace.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn1nospace.xml", "../resources/AddRequest.xml", null, appendElements, null, null, null); - + } @Test @@ -486,19 +486,19 @@ public class OutTransformWriterTest extends Assert { List dropElements = new ArrayList<>(); dropElements.add("param"); - TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn3.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn3.xml", "../resources/AddRequest3.xml", transformElements, appendElements, dropElements, null, null); - + } - + @Test public void testOldSTSTransform() throws Exception { Map transformElements = new HashMap(); transformElements.put("{http://docs.oasis-open.org/ws-sx/ws-trust/200512}*", "{http://schemas.xmlsoap.org/ws/2005/02/trust}*"); - TransformTestUtils.transformOutStreamAndCompare("../resources/wstrustReqSTRCIn1.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/wstrustReqSTRCIn1.xml", "../resources/wstrustReqSTRC.xml", transformElements, null, null, null, null); } @@ -509,7 +509,7 @@ public class OutTransformWriterTest extends Assert { transformElements.put("{urn:abc}*", "{urn:a}*"); - TransformTestUtils.transformOutStreamAndCompare("../resources/multiNSIn1.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/multiNSIn1.xml", "../resources/multiNS.xml", transformElements, null, null, null, null); } @@ -520,25 +520,25 @@ public class OutTransformWriterTest extends Assert { "1".getBytes()); ByteArrayOutputStream os = new ByteArrayOutputStream(); - XMLStreamWriter writer = - new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()), + XMLStreamWriter writer = + new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()), null, null, null, null, false, ""); StaxUtils.copy(new StreamSource(is), writer); writer.flush(); XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(os.toByteArray())); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); StaxUtils.copy(reader, bos); String value = bos.toString(); - assertEquals("1", value); + assertEquals("1", value); } @Test public void testNamespacedAttributeDropElement() throws Exception { Map transformElements = new HashMap(); transformElements.put("{http://www.w3.org/2005/08/addressing}ReplyTo", ""); - TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeWSAReqIn.xml", + TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeWSAReqIn.xml", "../resources/greetMeWSAReq.xml", transformElements, null, null, null, null); } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java b/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java index df095bd..e2bfe38 100755 --- a/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java +++ b/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java @@ -40,58 +40,58 @@ import org.apache.cxf.staxutils.StaxUtils; import org.junit.Assert; /** - * + * */ public final class TransformTestUtils { private static final Logger LOG = LogUtils.getLogger(TransformTestUtils.class); private TransformTestUtils() { } - - // test utilities methods - - static void transformInStreamAndCompare(String inname, String outname, + + // test utilities methods + + static void transformInStreamAndCompare(String inname, String outname, Map transformElements, Map appendElements, List dropElements, Map transformAttributes, - Map appendAttributes) + Map appendAttributes) throws XMLStreamException { - + XMLStreamReader reader = createInTransformedStreamReader(inname, transformElements, appendElements, dropElements, transformAttributes); - XMLStreamReader teacher = + XMLStreamReader teacher = StaxUtils.createXMLStreamReader( TransformTestUtils.class.getResourceAsStream(outname)); - + verifyReaders(teacher, reader, false, true); } - static void transformOutStreamAndCompare(String inname, String outname, + static void transformOutStreamAndCompare(String inname, String outname, Map transformElements, Map appendElements, List dropElements, Map transformAttributes, - Map appendAttributes) + Map appendAttributes) throws XMLStreamException { - - XMLStreamReader reader = createOutTransformedStreamReader(inname, - transformElements, appendElements, - dropElements, transformAttributes, + + XMLStreamReader reader = createOutTransformedStreamReader(inname, + transformElements, appendElements, + dropElements, transformAttributes, false, null); - XMLStreamReader teacher = + XMLStreamReader teacher = StaxUtils.createXMLStreamReader( TransformTestUtils.class.getResourceAsStream(outname)); - + verifyReaders(teacher, reader, false, true); } static XMLStreamReader createInTransformedStreamReader( String file, - Map emap, + Map emap, Map eappend, List dropEls, Map amap) throws XMLStreamException { @@ -100,10 +100,10 @@ public final class TransformTestUtils { TransformTestUtils.class.getResourceAsStream(file)), emap, eappend, dropEls, amap, false); } - + static XMLStreamReader createOutTransformedStreamReader( String file, - Map emap, + Map emap, Map append, List dropEls, Map amap, @@ -111,8 +111,8 @@ public final class TransformTestUtils { String defaultNamespace) throws XMLStreamException { ByteArrayOutputStream os = new ByteArrayOutputStream(); - XMLStreamWriter writer = - new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()), + XMLStreamWriter writer = + new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()), emap, append, dropEls, amap, attributesToElements, defaultNamespace); StaxUtils.copy(new StreamSource(TransformTestUtils.class.getResourceAsStream(file)), writer); writer.flush(); @@ -121,20 +121,20 @@ public final class TransformTestUtils { } /** - * Verifies the two stream events are equivalent and throws an assertion + * Verifies the two stream events are equivalent and throws an assertion * exception at the first mismatch. * @param teacher * @param reader * @param eec * @throws XMLStreamException */ - static void verifyReaders(XMLStreamReader teacher, XMLStreamReader reader, + static void verifyReaders(XMLStreamReader teacher, XMLStreamReader reader, boolean eec, boolean pfx) throws XMLStreamException { // compare the elements and attributes while ignoring comments, line breaks, etc for (;;) { int revent = getNextEvent(reader); int tevent = getNextEvent(teacher); - + if (revent == -1 && tevent == -1) { break; } @@ -179,7 +179,7 @@ public final class TransformTestUtils { // compares each attribute for (int i = 0; i < acount; i++) { String avalue = attributesMap.remove(teacher.getAttributeName(i)); - Assert.assertEquals("attribute " + teacher.getAttributeName(i) + " has wrong value.", + Assert.assertEquals("attribute " + teacher.getAttributeName(i) + " has wrong value.", teacher.getAttributeValue(i), avalue); } // attributes must be exhausted @@ -190,14 +190,14 @@ public final class TransformTestUtils { int dcount = teacher.getNamespaceCount(); for (int i = 0; i < dcount; i++) { String p = teacher.getNamespacePrefix(i); - Assert.assertEquals("nsdecl prefix " + p + " is incorrectly bound.", + Assert.assertEquals("nsdecl prefix " + p + " is incorrectly bound.", teacher.getNamespaceURI(i), reader.getNamespaceURI(p)); } } /** * Returns the next relevant reader event. - * + * * @param reader * @return * @throws XMLStreamException http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java index dc17467..5caf301 100644 --- a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java +++ b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java @@ -38,7 +38,7 @@ public class ChainInitiationObserverTest extends Assert { private TestChain chain; private Message message; private ChainInitiationObserver observer; - + @Before public void setUp() { @@ -56,35 +56,35 @@ public class ChainInitiationObserverTest extends Assert { public void tearDown() { control.verify(); } - + @Test public void testPausedChain() { message.getInterceptorChain(); EasyMock.expectLastCall().andReturn(chain).times(2); control.replay(); - + observer.onMessage(message); assertTrue(chain.isInvoked()); } - + private static class TestChain extends PhaseInterceptorChain { - + private boolean invoked; - + TestChain(SortedSet ps) { super(ps); } - + @Override public void resume() { invoked = true; } - + @Override public State getState() { return State.PAUSED; } - + public boolean isInvoked() { return invoked; } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java b/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java index ab8568b..1352d76 100644 --- a/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java +++ b/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java @@ -31,16 +31,16 @@ public class HttpUriMapperTest extends Assert { URL url = new URL("http://localhost:8080/SoapContext/SoapPort"); String path = url.getPath(); assertEquals("/SoapContext", HttpUriMapper.getContextName(path)); - + url = new URL("http://localhost:8080/SoapContext/SoapPort/"); path = url.getPath(); assertEquals("/SoapContext/SoapPort", HttpUriMapper.getContextName(path)); - + url = new URL("http://localhost:8080/"); path = url.getPath(); assertEquals("", HttpUriMapper.getContextName(path)); } - + @Test public void testGetResourceBase() throws Exception { URL url = new URL("http://localhost:8080/SoapContext/SoapPort"); http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java index cd86280..c82416e 100644 --- a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java +++ b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java @@ -116,7 +116,7 @@ public class GZIPAcceptEncodingTest extends Assert { interceptor.handleMessage(outMessage); } - private void singleTest(String encoding, + private void singleTest(String encoding, GZIPOutInterceptor.UseGzip expectedUseGzip, String expectedGzipEncoding) throws Exception { @@ -130,7 +130,7 @@ public class GZIPAcceptEncodingTest extends Assert { } private void setAcceptEncoding(String enc) { - Map> protocolHeaders + Map> protocolHeaders = new TreeMap>(String.CASE_INSENSITIVE_ORDER); protocolHeaders.put(HttpHeaderHelper.getHeaderKey(HttpHeaderHelper.ACCEPT_ENCODING), Collections .singletonList(enc)); http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java index 3229ef9..bb177df 100644 --- a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java +++ b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java @@ -44,7 +44,7 @@ public class AutomaticWorkQueueTest extends Assert { public static final int TIMEOUT = 100; AutomaticWorkQueueImpl workqueue; - + @After public void tearDown() throws Exception { if (workqueue != null) { @@ -52,7 +52,7 @@ public class AutomaticWorkQueueTest extends Assert { workqueue = null; } } - + @Test public void testUnboundedConstructor() { workqueue = new AutomaticWorkQueueImpl(UNBOUNDED_MAX_QUEUE_SIZE, INITIAL_SIZE, @@ -77,14 +77,14 @@ public class AutomaticWorkQueueTest extends Assert { assertEquals(DEFAULT_LOW_WATER_MARK, workqueue.getLowWaterMark()); } - + @Test public void testEnqueueWithTimeout() throws Exception { workqueue = new AutomaticWorkQueueImpl(2, 2, 2, 2, DEFAULT_DEQUEUE_TIMEOUT); - + final Object lock = new Object(); int x = 0; try { @@ -105,8 +105,8 @@ public class AutomaticWorkQueueTest extends Assert { assertTrue("Expect RejectedExecutionException when the work queue is full.", x <= 4); } } - - + + @Test public void testEnqueue() { workqueue = new AutomaticWorkQueueImpl(DEFAULT_MAX_QUEUE_SIZE, INITIAL_SIZE, @@ -188,7 +188,7 @@ public class AutomaticWorkQueueTest extends Assert { // ignore } } - + for (int i = 0; i < DEFAULT_MAX_QUEUE_SIZE; i++) { fillers[i] = new BlockingWorkItem(); try { @@ -271,7 +271,7 @@ public class AutomaticWorkQueueTest extends Assert { checkDeadLock(dead); } - + @Test public void testSchedule() throws Exception { workqueue = new AutomaticWorkQueueImpl(UNBOUNDED_MAX_QUEUE_SIZE, INITIAL_SIZE, @@ -291,16 +291,16 @@ public class AutomaticWorkQueueTest extends Assert { } } }; - + workqueue.schedule(doNothing, 5000); - + runLock.lock(); try { runCondition.await(); } finally { runLock.unlock(); } - + assertTrue("expected delay", System.currentTimeMillis() - start >= 4950); } @@ -322,14 +322,14 @@ public class AutomaticWorkQueueTest extends Assert { // ignore } } -// if (System.getProperty("java.version").startsWith("1.6") +// if (System.getProperty("java.version").startsWith("1.6") // || System.getProperty("java.vendor").startsWith("IBM")) { // // ThreadPoolExecutor in 1.6 is broken. The size can get below // // the low watermark. Oddly, this also appears to happen with // // the ibm jdk. assertTrue(workqueue.getLowWaterMark() >= workqueue.getPoolSize()); // } else { -// assertEquals(workqueue.getLowWaterMark(), workqueue.getPoolSize()); +// assertEquals(workqueue.getLowWaterMark(), workqueue.getPoolSize()); // } } @@ -356,7 +356,7 @@ public class AutomaticWorkQueueTest extends Assert { assertTrue("threads_total(): " + sz, workqueue.getPoolSize() <= DEFAULT_LOW_WATER_MARK); } - @Test + @Test public void testShutdown() { workqueue = new AutomaticWorkQueueImpl(DEFAULT_MAX_QUEUE_SIZE, INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE, 500); @@ -378,7 +378,7 @@ public class AutomaticWorkQueueTest extends Assert { } assertEquals(0, workqueue.getSize()); assertEquals(0, workqueue.getPoolSize()); - + //already shutdown workqueue = null; } @@ -396,13 +396,13 @@ public class AutomaticWorkQueueTest extends Assert { // No reduction in the completion count so it may be deadlocked, // allow thread to make no progress for 5 time-slices before // assuming a deadlock has occurred - // + // if (oldCompleted != 0 && ++noProgressCount > 5) { - - fail("No reduction in threads in 1.25 secs: \n" - + "oldCompleted: " + oldCompleted - + "\nof " + dead.getWorkItemCount()); + + fail("No reduction in threads in 1.25 secs: \n" + + "oldCompleted: " + oldCompleted + + "\nof " + dead.getWorkItemCount()); } } try { http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java index c954c04..952e1e9 100644 --- a/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java +++ b/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java @@ -32,7 +32,7 @@ import demo.hw.server.HelloWorld; public final class Client { private Client() { - } + } public static void main(String args[]) throws Exception { ClientProxyFactoryBean factory = new ClientProxyFactoryBean(); http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/HelloWorld.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/HelloWorld.java b/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/HelloWorld.java index c66a7c7..c57d048 100644 --- a/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/HelloWorld.java +++ b/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/HelloWorld.java @@ -21,7 +21,7 @@ package demo.hw.server; import org.w3c.dom.Document; public interface HelloWorld { - + String sayHi(String text); Document getADocument(); } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/aegis/src/test/java/org/apache/cxf/sample/test/TestAegisSample.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/aegis/src/test/java/org/apache/cxf/sample/test/TestAegisSample.java b/distribution/src/main/release/samples/aegis/src/test/java/org/apache/cxf/sample/test/TestAegisSample.java index 3e3038e..9b8a2d9 100644 --- a/distribution/src/main/release/samples/aegis/src/test/java/org/apache/cxf/sample/test/TestAegisSample.java +++ b/distribution/src/main/release/samples/aegis/src/test/java/org/apache/cxf/sample/test/TestAegisSample.java @@ -27,14 +27,14 @@ import demo.hw.server.Server; /** - * + * */ public class TestAegisSample { @BeforeClass public static void startServer() throws Exception { Server.startServer(); } - + @Test public void testClient() throws Exception { Client.main(null); http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java index 50e4e36..f6054c3 100644 --- a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java +++ b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java @@ -34,7 +34,7 @@ import org.apache.cxf.demo.aegis.types.Animal; import org.apache.cxf.demo.aegis.types.Zoo; /** - * + * */ public final class ReadZoo { http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java index 869b612..6269934 100644 --- a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java +++ b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java @@ -39,7 +39,7 @@ import org.apache.cxf.demo.aegis.types.Zoo; import javanet.staxutils.IndentingXMLStreamWriter; /** - * + * */ public final class WriteZoo { private XMLOutputFactory outputFactory; http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/types/Zoo.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/types/Zoo.java b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/types/Zoo.java index e7df8ab..73b295b 100644 --- a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/types/Zoo.java +++ b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/types/Zoo.java @@ -22,7 +22,7 @@ package org.apache.cxf.demo.aegis.types; import java.util.Map; /** - * + * */ public class Zoo { private String name; @@ -35,7 +35,7 @@ public class Zoo { public void setFounder(String founder) { this.founder = founder; } - + public String getName() { return name; } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java index 8ff3439..9f18045 100644 --- a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java +++ b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java @@ -22,15 +22,15 @@ package demo.hw_http.server; import java.util.logging.Logger; import org.apache.hello_world_soap_http.Greeter; -@javax.jws.WebService(name = "Soap", serviceName = "SOAPService", - targetNamespace = "http://apache.org/hello_world_soap_http", +@javax.jws.WebService(name = "Soap", serviceName = "SOAPService", + targetNamespace = "http://apache.org/hello_world_soap_http", wsdlLocation = "file:./wsdl/hello_world.wsdl") - + public class GreeterImpl implements Greeter { - private static final Logger LOG = + private static final Logger LOG = Logger.getLogger(GreeterImpl.class.getPackage().getName()); - + /* (non-Javadoc) * @see org.objectweb.hello_world_soap_http.Greeter#greetMe(java.lang.String) */ http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java index 4b8ea22..dc4863f 100644 --- a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java +++ b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java @@ -23,14 +23,14 @@ package demo.callback.client; import org.apache.callback.CallbackPortType; -@javax.jws.WebService(serviceName = "CallbackService", +@javax.jws.WebService(serviceName = "CallbackService", portName = "CallbackPort", endpointInterface = "org.apache.callback.CallbackPortType", targetNamespace = "http://apache.org/callback") - + public class CallbackImpl implements CallbackPortType { - + /** * serverSayHi * @param: return_message (String) @@ -41,5 +41,5 @@ public class CallbackImpl implements CallbackPortType { System.out.println("Message received: " + message); return new String("Hi " + message); } - + } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java index e27981b..34207f8 100644 --- a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java +++ b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java @@ -42,22 +42,22 @@ import org.apache.cxf.staxutils.StaxUtils; public final class Client { - private static final QName SERVICE_NAME + private static final QName SERVICE_NAME = new QName("http://apache.org/callback", "SOAPService"); private Client() { - } + } public static void main(String args[]) throws Exception { - - + + Object implementor = new CallbackImpl(); String address = "http://localhost:9005/CallbackContext/CallbackPort"; Endpoint endpoint = Endpoint.publish(address, implementor); - - if (args.length == 0) { + + if (args.length == 0) { System.out.println("please specify wsdl"); - System.exit(1); + System.exit(1); } URL wsdlURL; @@ -67,22 +67,22 @@ public final class Client { } else { wsdlURL = new URL(args[0]); } - + SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME); ServerPortType port = ss.getSOAPPort(); - + InputStream is = demo.callback.client.Client.class.getResourceAsStream("/callback_infoset.xml"); Document doc = StaxUtils.read(is); Element referenceParameters = DOMUtils.findChildWithAtt(doc.getDocumentElement(), "wsa:ReferenceParameters", "name", ""); W3CEndpointReference ref = (W3CEndpointReference)endpoint.getEndpointReference(referenceParameters); - + String resp = port.registerCallback(ref); System.out.println("Response from server: " + resp); - - System.exit(0); + + System.exit(0); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java index 66d1e05..5483b35 100644 --- a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java +++ b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java @@ -27,15 +27,15 @@ import org.apache.callback.CallbackPortType; import org.apache.callback.ServerPortType; -@javax.jws.WebService(serviceName = "SOAPService", +@javax.jws.WebService(serviceName = "SOAPService", portName = "SOAPPort", targetNamespace = "http://apache.org/callback", - endpointInterface = "org.apache.callback.ServerPortType") - + endpointInterface = "org.apache.callback.ServerPortType") + public class ServerImpl implements ServerPortType { - + public String registerCallback(W3CEndpointReference callback) { - + try { WebServiceFeature[] wfs = new WebServiceFeature[] {}; @@ -44,16 +44,16 @@ public class ServerImpl implements ServerPortType { System.out.println("Invoking callback object"); String resp = port.serverSayHi(System.getProperty("user.name")); System.out.println("Response from callback object: " + resp); - - + + } catch (Exception ex) { ex.printStackTrace(); return null; } - - return "registerCallback called"; + + return "registerCallback called"; } - - + + } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java index c167f10..709f2e3 100644 --- a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java +++ b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java @@ -27,26 +27,26 @@ import org.apache.hello_world_soap_http.SOAPService; public final class Client { - private static final QName SERVICE_NAME + private static final QName SERVICE_NAME = new QName("http://apache.org/hello_world_soap_http", "SOAPService"); private Client() { - } + } public static void main(String args[]) throws Exception { URL wsdlURL = Client.class.getResource("/wsdl/hello_world.wsdl"); SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME); Greeter port = ss.getSoapPort(); - String resp; + String resp; System.out.println("Invoking sayHi..."); resp = port.sayHi(); System.out.println("Server responded with: " + resp); System.out.println(); - - System.exit(0); + + System.exit(0); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java index e534329..2c3bf7d 100644 --- a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java +++ b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java @@ -37,7 +37,7 @@ public class StreamInterceptor extends AbstractPhaseInterceptor { super(Phase.PRE_STREAM); addBefore(SoapPreProtocolOutInterceptor.class.getName()); } - + public void handleMessage(Message message) { //TODO @@ -49,7 +49,7 @@ public class StreamInterceptor extends AbstractPhaseInterceptor { OutputStream os = message.getContent(OutputStream.class); CachedStream cs = new CachedStream(); message.setContent(OutputStream.class, cs); - + message.getInterceptorChain().doIntercept(message); try { @@ -80,20 +80,20 @@ public class StreamInterceptor extends AbstractPhaseInterceptor { public void handleFault(Message message) { } - + private class CachedStream extends CachedOutputStream { CachedStream() { super(); } - + protected void doFlush() throws IOException { currentStream.flush(); } protected void doClose() throws IOException { } - + protected void onWrite() throws IOException { } } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java index 094c466..db6f07a 100644 --- a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java +++ b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java @@ -24,15 +24,15 @@ import org.apache.hello_world_soap_http.Greeter; import org.apache.hello_world_soap_http.PingMeFault; import org.apache.hello_world_soap_http.types.FaultDetail; -@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService", - targetNamespace = "http://apache.org/hello_world_soap_http", +@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService", + targetNamespace = "http://apache.org/hello_world_soap_http", endpointInterface = "org.apache.hello_world_soap_http.Greeter") - + public class GreeterImpl implements Greeter { - private static final Logger LOG = + private static final Logger LOG = Logger.getLogger(GreeterImpl.class.getPackage().getName()); - + /* (non-Javadoc) * @see org.apache.hello_world_soap_http.Greeter#greetMe(java.lang.String) */ @@ -42,7 +42,7 @@ public class GreeterImpl implements Greeter { System.out.println("Message received: " + me + "\n"); return "Hello " + me; } - + /* (non-Javadoc) * @see org.apache.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String) */ @@ -60,7 +60,7 @@ public class GreeterImpl implements Greeter { System.out.println("Executing operation sayHi\n"); return "Bonjour"; } - + public void pingMe() throws PingMeFault { FaultDetail faultDetail = new FaultDetail(); faultDetail.setMajor((short)2); @@ -70,5 +70,5 @@ public class GreeterImpl implements Greeter { throw new PingMeFault("PingMeFault raised by server", faultDetail); } - + } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java index 41a9738..78691b4 100644 --- a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java +++ b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java @@ -29,7 +29,7 @@ import bank.common.BankCORBAService; public final class Client { - private static final QName SERVICE_NAME + private static final QName SERVICE_NAME = new QName("http://cxf.apache.org/schemas/cxf/idl/bank", "BankCORBAService"); private Client() { @@ -37,10 +37,10 @@ public final class Client { public static void main(String args[]) throws Exception { URL wsdlUrl = Client.class.getResource("/wsdl/bank.wsdl"); - + BankCORBAService ss = new BankCORBAService(wsdlUrl, SERVICE_NAME); - Bank port = ss.getBankCORBAPort(); - + Bank port = ss.getBankCORBAPort(); + System.out.print("Invoking createAccount for Mr. John... "); javax.xml.ws.Holder account = new javax.xml.ws.Holder(new Account()); @@ -56,7 +56,7 @@ public final class Client { Account bankAccount = account.value; if (bankAccount != null) { - System.out.println("Created Account : " + System.out.println("Created Account : " + bankAccount.getName() + ": " + bankAccount.getBalance()); } @@ -71,16 +71,16 @@ public final class Client { } } catch (AccountNotFoundException ex) { System.out.println("failure (" + ex.getMessage() + " : " + ex.getFaultInfo().getName() + ")"); - } + } System.out.println("Getting an non-existent account (Ms. Helen)..."); try { bankAccount = port.getAccount("Helen"); } catch (AccountNotFoundException ex) { - System.out.println("Caught the expected AccountNotFoundException(" + System.out.println("Caught the expected AccountNotFoundException(" + ex.getFaultInfo().getName() + ")"); } - + System.exit(0); } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java index 987d049..420d9fd 100644 --- a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java +++ b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java @@ -28,8 +28,8 @@ import bank.common.AccountNotFoundException; import bank.common.AccountNotFoundExceptionType; import bank.common.Bank; -@javax.jws.WebService(portName = "BankCORBAPort", serviceName = "BankCORBAService", - targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/bank", +@javax.jws.WebService(portName = "BankCORBAPort", serviceName = "BankCORBAService", + targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/bank", wsdlLocation = "classpath:/wsdl/bank.wsdl", endpointInterface = "bank.common.Bank") @@ -38,7 +38,7 @@ public class BankImpl implements Bank { Map accounts = new HashMap(); public boolean createAccount(String name, javax.xml.ws.Holder account) - throws AccountAlreadyExistsException { + throws AccountAlreadyExistsException { System.out.println("Creating account: " + name); boolean result = false; http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java index 060182a..ad658df 100644 --- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java +++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java @@ -36,9 +36,9 @@ public final class Client { //not constructed } static int run(ORB orb, String[] args) throws UserException { - + // Get the Bank object - org.omg.CORBA.Object obj = + org.omg.CORBA.Object obj = orb.string_to_object("corbaname::localhost:1050#Bank"); if (obj == null) { System.err.println("bank.Client: cannot read IOR from corbaname::localhost:1050#Bank"); @@ -63,7 +63,7 @@ public final class Client { account2.deposit(5.00f); System.out.println("Current balance of \"Account2\" is " + account2.get_balance()); System.out.println(); - + // Create two more accounts to use with the getAccount calls Account acc3 = bank.create_account("Account3"); acc3.deposit(200.00f); http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/AccountImpl.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/AccountImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/AccountImpl.java index 0ccb41a..82ef659 100644 --- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/AccountImpl.java +++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/AccountImpl.java @@ -27,15 +27,15 @@ import corba.common.AccountPOA; public class AccountImpl extends AccountPOA { - + // The servants default POA private POA poa_; private float balance; - + public AccountImpl(POA poa) { poa_ = poa; - + balance = 0.0f; } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java index d24563a..8e83f31 100644 --- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java +++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java @@ -30,11 +30,11 @@ import corba.common.BankPOA; public class BankImpl extends BankPOA { - + private POA poa_; private Map accountList; - + BankImpl(POA poa) { poa_ = poa; @@ -45,12 +45,12 @@ public class BankImpl extends BankPOA { if (accountList.containsKey(accountName)) { return accountList.get(accountName); } - + System.out.println("[Bank] Called create_account( " + accountName + " )..."); - System.out.println(); + System.out.println(); AccountImpl accountImpl = new AccountImpl(poa_); String name = "Account-" + accountName; - byte[] oid = name.getBytes(); + byte[] oid = name.getBytes(); try { poa_.activate_object_with_id(oid, accountImpl); } catch (Exception ex) { @@ -73,7 +73,7 @@ public class BankImpl extends BankPOA { AccountImpl accountImpl = new AccountImpl(poa_); String name = "Account-" + accountName; - byte[] oid = name.getBytes(); + byte[] oid = name.getBytes(); try { poa_.activate_object_with_id(oid, accountImpl); } catch (Exception ex) { @@ -117,7 +117,7 @@ public class BankImpl extends BankPOA { System.out.println(); accountList.remove(accountName); } - + public POA _default_POA() { return poa_; } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java index 946dcd7..aa1de39 100644 --- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java +++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java @@ -36,8 +36,8 @@ public final class Server { private Server() { //not created } - - + + static int run(ORB orb, String[] args) throws UserException { // // Resolve Root POA @@ -78,7 +78,7 @@ public final class Server { public static void main(String args[]) { Properties props = System.getProperties(); props.put("org.omg.CORBA.ORBInitialHost", "localhost"); - props.put("org.omg.CORBA.ORBInitialPort", "1050"); + props.put("org.omg.CORBA.ORBInitialPort", "1050"); int status = 0; ORB orb = null; http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java index b2d9e26..776c250 100644 --- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java +++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java @@ -34,12 +34,12 @@ public final class Client { private static final Logger LOG = Logger.getLogger(Client.class.getPackage().getName()); - + private Client() { } public static void main(String args[]) throws Exception { - + LOG.log(Level.INFO, "Resolving the bank object"); BankCORBAService service = new BankCORBAService(); Bank port = service.getBankCORBAPort(); @@ -53,8 +53,8 @@ public final class Client { System.out.println("Current balance of account \"Account1\" is " + account1.getBalance()); System.out.println(); - /* Re-enable when we have a utility to manipulate the meta data stored - within the EPR. + /* Re-enable when we have a utility to manipulate the meta data stored + within the EPR. // Test the method Bank.createEprAccount() System.out.println("Creating account called \"Account2\""); W3CEndpointReference epr2 = port.createEprAccount("Account2"); @@ -70,7 +70,7 @@ public final class Client { acc3.deposit(200.00f); Account acc4 = getAccountFromEPR(port.createAccount("Account4")); acc4.deposit(400.00f); - + // Test the method Bank.getAccount() System.out.println("Retrieving account called \"Account3\""); W3CEndpointReference epr3 = port.getAccount("Account3"); @@ -81,8 +81,8 @@ public final class Client { System.out.println("New balance for account \"Account3\" is " + account3.getBalance()); System.out.println(); - /* Re-enable when we have a utility to manipulate the meta data stored - within the EPR. + /* Re-enable when we have a utility to manipulate the meta data stored + within the EPR. // Test the method Bank.getEprAccount() System.out.println("Retrieving account called \"Account4\""); EndpointReferenceType epr4 = port.getEprAccount("Account4"); http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java index 5179616..e54eafb 100644 --- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java +++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java @@ -28,9 +28,9 @@ import cxf.common.Account; endpointInterface = "cxf.common.Account") public class AccountImpl implements Account { - + private float balance; - + public float getBalance() { System.out.println("[Account] Called AccountImpl.getBalance()..."); System.out.println(); http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java index ad01df5..63a835b 100644 --- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java +++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java @@ -27,7 +27,7 @@ import javax.xml.ws.wsaddressing.W3CEndpointReference; import cxf.common.Bank; -@javax.jws.WebService(portName = "BankCORBAPort", +@javax.jws.WebService(portName = "BankCORBAPort", serviceName = "BankCORBAService", targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/Bank", wsdlLocation = "classpath:/wsdl/BankWS-corba.wsdl", @@ -35,13 +35,13 @@ import cxf.common.Bank; public class BankImpl implements Bank { - private Map accountList = + private Map accountList = new HashMap(); private Map endpointList = new HashMap(); public BankImpl() { } - + public W3CEndpointReference createAccount(String accountName) { System.out.println("[Bank] Called createAccount( " + accountName + " )..."); System.out.println(); @@ -79,7 +79,7 @@ public class BankImpl implements Bank { public W3CEndpointReference getAccountEprWithNoUseAttribute(String accountName) { return null; } - + // TODO: What is the correct implementation for this operation? public void findAccount(javax.xml.ws.Holder accountDetails) { } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java b/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java index 6b59393..baa4958 100644 --- a/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java +++ b/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java @@ -31,7 +31,7 @@ public final class Client { private Client() { //not consructed } - + static int run(ORB orb, String[] args) throws UserException { // Get "hello" object http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java b/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java index 09c3a66..f72bad1 100644 --- a/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java +++ b/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java @@ -21,11 +21,11 @@ package cxf.server; import cxf.common.HelloWorld; -@javax.jws.WebService(portName = "HelloWorldCORBAPort", serviceName = "HelloWorldCORBAService", +@javax.jws.WebService(portName = "HelloWorldCORBAPort", serviceName = "HelloWorldCORBAService", targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/HelloWorld", wsdlLocation = "classpath:/wsdl/HelloWorld-corba.wsdl", endpointInterface = "cxf.common.HelloWorld") - + public class HelloWorldImpl implements HelloWorld { public java.lang.String greetMe(java.lang.String inparameter) { http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java index 7917fff..3c6b77e 100644 --- a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java +++ b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java @@ -31,7 +31,7 @@ public final class Client { public static void main(String args[]) throws Exception { // START SNIPPET: client - ClassPathXmlApplicationContext context + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"}); HelloWorld client = (HelloWorld)context.getBean("client"); http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java index 32a2811..2ddb7fa 100755 --- a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java +++ b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java @@ -42,23 +42,23 @@ import demo.colocated.server.Server; public final class DispatchSourceClient { private static final String ADDRESS = "http://localhost:9000/SoapContext/GreeterPort"; - private static final String SERVICE_NS = "http://apache.org/hello_world_soap_http"; + private static final String SERVICE_NS = "http://apache.org/hello_world_soap_http"; private static final QName SERVICE_NAME = new QName(SERVICE_NS, "SOAPService"); private static final QName PORT_NAME = new QName(SERVICE_NS, "SoapPort"); private static final String PAYLOAD_NAMESPACE_URI = "http://apache.org/hello_world_soap_http/types"; - private static final String SAYHI_REQUEST_TEMPLATE + private static final String SAYHI_REQUEST_TEMPLATE = ""; - private static final String GREETME_REQUEST_TEMPLATE + private static final String GREETME_REQUEST_TEMPLATE = "" + "%s"; - private static final String PINGME_REQUEST_TEMPLATE + private static final String PINGME_REQUEST_TEMPLATE = ""; private static final QName SAYHI_OPERATION_NAME = new QName(SERVICE_NS, "sayHi"); private static final QName GREETME_OPERATION_NAME = new QName(SERVICE_NS, "greetMe"); private static final QName PINGME_OPERATION_NAME = new QName(SERVICE_NS, "pingMe"); - + private DispatchSourceClient() { @@ -67,15 +67,15 @@ public final class DispatchSourceClient { public static void main(String args[]) throws Exception { Server.main(new String[]{"inProcess"}); - + Service service = Service.create(SERVICE_NAME); service.addPort(PORT_NAME, SOAPBinding.SOAP11HTTP_BINDING, ADDRESS); - + Dispatch dispatch = service.createDispatch(PORT_NAME, Source.class, Service.Mode.PAYLOAD); - + String resp; Source response; - + System.out.println("Invoking sayHi..."); setOperation(dispatch, SAYHI_OPERATION_NAME); response = dispatch.invoke(encodeSource(SAYHI_REQUEST_TEMPLATE, null)); @@ -99,9 +99,9 @@ public final class DispatchSourceClient { } System.exit(0); } - + private static void setOperation(Dispatch dispatch, QName operationName) { - dispatch.getRequestContext().put(MessageContext.WSDL_OPERATION, operationName); + dispatch.getRequestContext().put(MessageContext.WSDL_OPERATION, operationName); } private static Source encodeSource(String template, String value) throws IOException { @@ -118,20 +118,20 @@ public final class DispatchSourceClient { transformer.transform(source, new SAXResult(handler)); return handler.getValue(); } - + static class ContentHandler extends DefaultHandler { StringBuffer buffer; String namespaceURI; String elementName; boolean recording; - + ContentHandler(String namespaceURI, String elementName) { this.namespaceURI = namespaceURI; this.elementName = elementName; } - + /* (non-Javadoc) - * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, + * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, * java.lang.String, java.lang.String, org.xml.sax.Attributes) */ @Override @@ -144,7 +144,7 @@ public final class DispatchSourceClient { /* (non-Javadoc) - * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, + * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, * java.lang.String, java.lang.String) */ @Override @@ -173,5 +173,5 @@ public final class DispatchSourceClient { public String getValue() { return buffer == null ? null : buffer.toString(); } - } + } }