You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/09/17 13:03:56 UTC
svn commit: r998070 - in /camel/trunk/examples/camel-example-cxf/src:
main/java/org/apache/camel/example/cxf/
main/java/org/apache/camel/example/cxf/jaxrs/
main/java/org/apache/camel/example/cxf/provider/
main/java/org/apache/camel/example/jms/ test/ja...
Author: davsclaus
Date: Fri Sep 17 11:03:55 2010
New Revision: 998070
URL: http://svn.apache.org/viewvc?rev=998070&view=rev
Log:
Polished
Modified:
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/CamelCxfExample.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/GreeterImpl.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Server.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/Client.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXWSClient.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/CamelCxfExample.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/jms/JmsBroker.java
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/provider/ProviderClientServerTest.java
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/CamelCxfExample.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/CamelCxfExample.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/CamelCxfExample.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/CamelCxfExample.java Fri Sep 17 11:03:55 2010
@@ -25,7 +25,6 @@ import org.apache.camel.impl.DefaultCame
* 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.
- *
*/
public final class CamelCxfExample {
private static final String ROUTER_ADDRESS = "http://localhost:9001/SoapContext/SoapPort";
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java Fri Sep 17 11:03:55 2010
@@ -63,7 +63,6 @@ public final class Client {
}
public void invoke() throws Exception {
-
System.out.println("Acquiring router port ...");
Greeter port = getProxy();
String resp;
@@ -92,7 +91,6 @@ public final class Client {
System.out.println("FaultDetail major:" + detail.getMajor());
System.out.println("FaultDetail minor:" + detail.getMinor());
}
-
}
}
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/GreeterImpl.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/GreeterImpl.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/GreeterImpl.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/GreeterImpl.java Fri Sep 17 11:03:55 2010
@@ -31,9 +31,6 @@ public class GreeterImpl implements Gree
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)
- */
public String greetMe(String me) {
LOG.info("Executing operation greetMe");
System.out.println("Executing operation greetMe");
@@ -41,18 +38,12 @@ public class GreeterImpl implements Gree
return "Hello " + me;
}
- /* (non-Javadoc)
- * @see org.apache.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
- */
public void greetMeOneWay(String me) {
LOG.info("Executing operation greetMeOneWay");
System.out.println("Executing operation greetMeOneWay\n");
System.out.println("Hello there " + me);
}
- /* (non-Javadoc)
- * @see org.apache.hello_world_soap_http.Greeter#sayHi()
- */
public String sayHi() {
LOG.info("Executing operation sayHi");
System.out.println("Executing operation sayHi\n");
@@ -69,5 +60,4 @@ public class GreeterImpl implements Gree
throw new PingMeFault("PingMeFault raised by server", faultDetail);
}
-
}
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Server.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Server.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Server.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Server.java Fri Sep 17 11:03:55 2010
@@ -26,7 +26,6 @@ public class Server {
Object implementor = new GreeterImpl();
String address = "http://cxf.apache.org/transports/jms";
endpoint = Endpoint.publish(address, implementor);
-
}
public void stop() {
@@ -35,7 +34,6 @@ public class Server {
}
}
-
public static void main(String args[]) throws Exception {
Server server = new Server();
System.out.println("Server ready...");
@@ -45,4 +43,5 @@ public class Server {
server.stop();
System.exit(0);
}
+
}
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java Fri Sep 17 11:03:55 2010
@@ -37,9 +37,6 @@ public class CamelRouterBuilder extends
/**
* Allow this route to be run as an application
- *
- * @param args
- * @throws Exception
*/
public static void main(String[] args) throws Exception {
CamelContext context = new DefaultCamelContext();
@@ -73,7 +70,7 @@ public class CamelRouterBuilder extends
book = bookStore.getBook(126L);
System.out.println("Get the book with id 126. " + book);
} catch (Exception exception) {
- System.out.println("Get the exception " + exception.getCause());
+ System.out.println("Get the exception " + exception);
}
Thread.sleep(1000);
@@ -91,8 +88,6 @@ public class CamelRouterBuilder extends
from(REST_ENDPOINT_URI)
.process(new MappingProcessor(new BookStoreImpl(true)));
-
-
}
// Mapping the request to object's invocation
@@ -134,4 +129,5 @@ public class CamelRouterBuilder extends
return answer;
}
}
+
}
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/Client.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/Client.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/Client.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/Client.java Fri Sep 17 11:03:55 2010
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.example.cxf.jaxrs;
import org.apache.camel.example.cxf.jaxrs.resources.Book;
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java Fri Sep 17 11:03:55 2010
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.example.cxf.jaxrs;
import java.util.Collections;
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXWSClient.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXWSClient.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXWSClient.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXWSClient.java Fri Sep 17 11:03:55 2010
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.example.cxf.jaxrs;
import org.apache.camel.example.cxf.jaxrs.resources.BookStore;
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/CamelCxfExample.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/CamelCxfExample.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/CamelCxfExample.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/CamelCxfExample.java Fri Sep 17 11:03:55 2010
@@ -27,25 +27,21 @@ public final class CamelCxfExample {
}
public static void main(String args[]) throws Exception {
-
Server server = new Server();
try {
-
// start the endpoints
server.start();
// set the client's service access point
Client client = new Client("http://localhost:9000/GreeterContext/SOAPMessageService");
// invoke the services
String response = client.invoke();
-
System.out.println(response);
-
- } catch (Exception ex) {
- ex.printStackTrace();
+ } catch (Exception e) {
+ System.out.println("Get the exception " + e);
} finally {
server.stop();
System.exit(0);
}
-
}
+
}
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java Fri Sep 17 11:03:55 2010
@@ -98,11 +98,10 @@ public final class Client {
SOAPElement bodyElement = (SOAPElement)body.getChildElements(responseName).next();
String responseMessageText = bodyElement.getTextContent();
-
+
System.out.println("Get the response: " + responseMessageText);
return responseMessageText;
-
}
public static void main(String[] args) throws Exception {
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java Fri Sep 17 11:03:55 2010
@@ -25,7 +25,6 @@ public class Server {
public void start() throws Exception {
// Setup the Camel context using Spring
applicationContext = new ClassPathXmlApplicationContext("/META-INF/spring/CamelCXFProviderRouteConfig.xml");
-
}
public void stop() {
@@ -34,7 +33,6 @@ public class Server {
}
}
-
public static void main(String args[]) throws Exception {
Server server = new Server();
System.out.println("Server ready...");
@@ -44,4 +42,5 @@ public class Server {
server.stop();
System.exit(0);
}
+
}
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java Fri Sep 17 11:03:55 2010
@@ -32,7 +32,6 @@ import org.apache.camel.Exchange;
/**
* A simple bean demonstrating the processing of a SOAPMessage routed by Camel
- *
*/
//START SNIPPET: e1
public class TesterBean {
@@ -65,8 +64,7 @@ public class TesterBean {
SOAPMessage soapMessage = MessageFactory.newInstance().createMessage();
SOAPBody body = soapMessage.getSOAPPart().getEnvelope().getBody();
- QName payloadName = new QName("http://apache.org/hello_world_soap_http/types", "greetMeResponse",
- "ns1");
+ QName payloadName = new QName("http://apache.org/hello_world_soap_http/types", "greetMeResponse", "ns1");
SOAPBodyElement payload = body.addBodyElement(payloadName);
@@ -78,7 +76,6 @@ public class TesterBean {
e.printStackTrace();
throw new RuntimeException(e);
}
-
}
}
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/jms/JmsBroker.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/jms/JmsBroker.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/jms/JmsBroker.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/jms/JmsBroker.java Fri Sep 17 11:03:55 2010
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.example.jms;
import java.io.File;
@@ -26,6 +25,7 @@ public final class JmsBroker {
JMSEmbeddedBroker jmsBrokerThread;
String jmsBrokerUrl = "vm://localhost";
String activeMQStorageDir;
+
public JmsBroker() {
}
@@ -53,8 +53,7 @@ public final class JmsBroker {
boolean shutdownBroker;
final String brokerUrl;
Exception exception;
-
-
+
public JMSEmbeddedBroker(String url) {
brokerUrl = url;
}
@@ -75,7 +74,6 @@ public final class JmsBroker {
public void run() {
try {
- //ContainerWapper container;
BrokerService broker = new BrokerService();
synchronized (this) {
broker.setPersistenceAdapter(new MemoryPersistenceAdapter());
@@ -97,8 +95,7 @@ public final class JmsBroker {
e.printStackTrace();
}
}
-
-
}
+
}
Modified: camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java Fri Sep 17 11:03:55 2010
@@ -78,6 +78,4 @@ public class CamelTransportClientServerT
}
-
-
}
Modified: camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java Fri Sep 17 11:03:55 2010
@@ -29,8 +29,7 @@ import org.springframework.context.suppo
public class CxfHttpJmsClientServerTest extends CamelSpringTestSupport {
private static final String ROUTER_ADDRESS = "http://localhost:9001/SoapContext/SoapPort";
-
-
+
@Test
//@Ignore("Due to the Spring 3.0.0 doesn't call the JMS listener container's start method by default"
// + "This test will be fix in the next released CXF")
@@ -61,7 +60,5 @@ public class CxfHttpJmsClientServerTest
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(new String[]{"/META-INF/spring/CxfRouteCamelContext.xml"});
}
-
-
}
Modified: camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java Fri Sep 17 11:03:55 2010
@@ -48,7 +48,6 @@ public class JAXRSClientServerTest exten
@Test
public void testJAXRSClient() throws BookNotFoundFault {
-
// JAXRSClient invocation
JAXRSClient jaxrsClient = new JAXRSClient();
BookStore bookStore = jaxrsClient.getBookStore();
Modified: camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/provider/ProviderClientServerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/provider/ProviderClientServerTest.java?rev=998070&r1=998069&r2=998070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/provider/ProviderClientServerTest.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/provider/ProviderClientServerTest.java Fri Sep 17 11:03:55 2010
@@ -36,10 +36,7 @@ public class ProviderClientServerTest ex
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
-
return new ClassPathXmlApplicationContext(new String[]{"/META-INF/spring/CamelCXFProviderRouteConfig.xml"});
}
-
-
}