Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/pom.xml =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/pom.xml (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/pom.xml (working copy) @@ -126,7 +126,7 @@ - + org.codehaus.mojo exec-maven-plugin Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/README.txt =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/README.txt (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/README.txt (working copy) @@ -9,7 +9,7 @@ For the latest & greatest documentation on how to use this example please see http://activemq.apache.org/camel/cxf-example.html -If you hit any problems please talk to us on the Camel Forums +If you hit any problems please let us know on the Camel Forums http://activemq.apache.org/camel/discussion-forums.html Please help us make Apache Camel better - we appreciate any feedback you may have. Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java (working copy) @@ -33,7 +33,7 @@ // set the client's service access point Client client = new Client("http://localhost:9090/GreeterContext/GreeterPort"); // invoking the services - client.invock(); + client.invoke(); Thread.sleep(1000); Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Client.java =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Client.java (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Client.java (working copy) @@ -47,7 +47,7 @@ - public void invock() throws Exception { + public void invoke() throws Exception { System.out.println("Acquiring router port ..."); Greeter port = service.getPort(PORT_NAME, Greeter.class); Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java (working copy) @@ -43,7 +43,7 @@ LOG.info("Executing operation greetMe"); System.out.println("Executing operation greetMe"); System.out.println("Message received: " + me + "\n"); - return "Hello " + me + "form " + suffix; + return "Hello " + me + " from " + suffix; } /* (non-Javadoc) Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/CamelCxfExample.java =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/CamelCxfExample.java (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/CamelCxfExample.java (working copy) @@ -26,8 +26,8 @@ import org.apache.camel.impl.DefaultCamelContext; /** - * An example class for demonstrating camel works as Router. - * This example shows how camel can route a SOAP over HTTP client's request + * An example for demonstrating how Camel works as a Router. + * This example shows how Camel can route a SOAP client's HTTP request * to a SOAP over JMS Service. * */ @@ -53,7 +53,7 @@ // START SNIPPET: e1 CamelContext context = new DefaultCamelContext(); // END SNIPPET: e1 - // set up the jms broker and the CXF SOAP over JMS server + // Set up the JMS broker and the CXF SOAP over JMS server // START SNIPPET: e2 JmsBroker broker = new JmsBroker(); Server server = new Server(); @@ -69,7 +69,7 @@ } }); // END SNIPPET: e3 - // Staring the routing context + // Starting the routing context // Using the CXF Client to kick off the invocations // START SNIPPET: e4 context.start(); @@ -75,9 +75,9 @@ context.start(); Client client = new Client(ROUTER_ADDRESS + "?wsdl"); // END SNIPPET: e4 - // Now everything is set up - lets start the context + // Now everything is set up - let's start the context - client.invock(); + client.invoke(); Thread.sleep(1000); context.stop(); } catch (Exception ex) { Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java (working copy) @@ -50,7 +50,7 @@ - public void invock() throws Exception { + public void invoke() throws Exception { System.out.println("Acquiring router port ..."); Greeter port = soapService.getSoapOverHttpRouter(); Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/CamelCxfExample.java =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/CamelCxfExample.java (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/CamelCxfExample.java (working copy) @@ -17,9 +17,9 @@ package org.apache.camel.example.cxf.provider; /** - * An example demonstrating routing of messages to JAXWS WebServiceProvider - * Endpoint through the camel route. The message could be SOAPEnvelope or Plain - * XML over HTTP or as defined by the JaxWS specification. + * An example demonstrating routing of messages to a JAXWS WebServiceProvider + * endpoint through a Camel route. The message could be either a SOAP envelope + * or plain XML over HTTP as defined by the JAX-WS specification. */ public final class CamelCxfExample { @@ -35,7 +35,7 @@ server.start(); // set the client's service access point Client client = new Client("http://localhost:9000/GreeterContext/SOAPMessageService"); - // invoking the services + // invoke the services client.invoke(); } catch (Exception ex) { Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java (working copy) @@ -29,8 +29,8 @@ import javax.xml.ws.soap.SOAPBinding; /** - * A simple client that uses JaxWS Dispatch API to call a service endpoint - * exposed in a servlet container. + * A simple client that uses the JAX-WS Dispatch API to call + * a service endpoint exposed in a servlet container. */ public final class Client { @@ -42,10 +42,10 @@ } public void invoke() throws Exception { - // Qnames for service as defined in wsdl. + // Service Qname as defined in the WSDL. QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPService"); - // QName for Port As defined in wsdl. + // Port QName as defined in the WSDL. QName portName = new QName("http://apache.org/hello_world_soap_http", "SoapOverHttpRouter"); // Create a dynamic Service instance @@ -82,7 +82,7 @@ SOAPMessage reply = null; try { - // Invoke Endpoint Operation and read response + // Invoke endpoint operation and read response reply = dispatch.invoke(request); } catch (WebServiceException wse) { wse.printStackTrace(); Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/GreeterProvider.java =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/GreeterProvider.java (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/GreeterProvider.java (working copy) @@ -30,7 +30,7 @@ // END SNIPPET: e1 /** * This class is used by Camel just for getting the endpoint configuration - * parameters. All the requests aimed at this class would be intercepted routed + * parameters. All the requests aimed at this class are intercepted and routed * to the camel route specified. The route has to set the appropriate response * message for the service to work. */ @@ -38,8 +38,8 @@ public class GreeterProvider implements Provider { public SOAPMessage invoke(SOAPMessage message) { - // request should not come here as camel route would intercept the call - // before this is invoked. + // Requests should not come here as the Camel route will + // intercept the call before this is invoked. throw new UnsupportedOperationException("Placeholder method"); } Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java (working copy) @@ -26,7 +26,7 @@ Endpoint endpoint; public void start() throws Exception { - // setup the camel context using spring + // Setup the Camel context using Spring SpringBusFactory bf = new SpringBusFactory(); BusFactory.setDefaultBus(null); Bus bus = bf.createBus("/org/apache/camel/example/cxf/provider/CamelCXFRouteConfig.xml"); Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java (working copy) @@ -31,7 +31,7 @@ import org.apache.camel.Exchange; /** - * A simple bean demonstrating processing of SOAPMessage routed by CAMEL + * A simple bean demonstrating the processing of a SOAPMessage routed by Camel * */ //START SNIPPET: e1 @@ -38,12 +38,12 @@ public class TesterBean { public SOAPMessage processSOAP(Exchange exchange) { - // since the camel-cxf endpoint use list to store the parameters - // and bean component use bodyAs expression to get the value - // we need to do deal the parameters ourself + // Since the Camel-CXF endpoint uses a list to store the parameters + // and bean component uses the bodyAs expression to get the value + // we'll need to deal with the parameters ourself SOAPMessage soapMessage = (SOAPMessage)exchange.getIn().getBody(List.class).get(0); if (soapMessage == null) { - System.out.println("Incoming null message deteced..."); + System.out.println("Incoming null message detected..."); return createDefaultSoapMessage("Greetings from Apache Camel!!!!", "null"); } Index: /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/cxf/provider/CamelCXFRouteConfig.xml =================================================================== --- /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/cxf/provider/CamelCXFRouteConfig.xml (revision 643714) +++ /home/gmazza/nbwork/camel/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/cxf/provider/CamelCXFRouteConfig.xml (working copy) @@ -29,8 +29,8 @@