You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/06/01 16:28:33 UTC
svn commit: r1130160 [2/2] - in /camel/trunk:
apache-camel/src/main/descriptors/ components/camel-cxf-transport/
components/camel-cxf-transport/src/ components/camel-cxf-transport/src/main/
components/camel-cxf-transport/src/main/java/ components/camel...
Copied: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java (from r1130060, camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java?p2=camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java&p1=camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java&r1=1130060&r2=1130160&rev=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java Wed Jun 1 14:28:29 2011
@@ -14,15 +14,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cxf.transport.spring;
+package org.apache.camel.component.cxf.jaxrs.testbean;
-import org.apache.camel.component.cxf.transport.CamelDestination;
+import javax.xml.bind.annotation.XmlRootElement;
-public class CamelDestinationDefinitionParser extends AbstractCamelContextBeanDefinitionParser {
+/**
+ *
+ * @version
+ */
+@XmlRootElement(name = "Customer")
+public class Customer {
+ private long id;
+ private String name;
+
+ public long getId() {
+ return id;
+ }
- public CamelDestinationDefinitionParser() {
- super();
- setBeanClass(CamelDestination.class);
+ public void setId(long id) {
+ this.id = id;
}
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
}
Added: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java Wed Jun 1 14:28:29 2011
@@ -0,0 +1,151 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf.jaxrs.testbean;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Response;
+
+
+
+/**
+ *
+ * @version
+ */
+@Path("/customerservice/")
+public class CustomerService {
+ long currentId = 123;
+ Map<Long, Customer> customers = new HashMap<Long, Customer>();
+ Map<Long, Order> orders = new HashMap<Long, Order>();
+
+ public CustomerService() {
+ init();
+ }
+
+ @GET
+ @Path("/customers/{id}/")
+ public Customer getCustomer(@PathParam("id") String id) {
+ long idNumber = Long.parseLong(id);
+ Customer c = customers.get(idNumber);
+ return c;
+ }
+
+ @GET
+ @Path("/customers")
+ public Customer getCustomerByQueryParam(@QueryParam("id") String id) {
+ long idNumber = Long.parseLong(id);
+ Customer c = customers.get(idNumber);
+ return c;
+ }
+
+ @GET
+ @Path("/customers/")
+ @Produces("application/xml")
+ public List<Customer> getCustomers() {
+ List<Customer> l = new ArrayList<Customer>(customers.values());
+ return l;
+ }
+
+
+ @PUT
+ @Path("/customers/")
+ public Response updateCustomer(Customer customer) {
+ Customer c = customers.get(customer.getId());
+ Response r;
+ if (c != null) {
+ customers.put(customer.getId(), customer);
+ r = Response.ok().build();
+ } else {
+ r = Response.notModified().build();
+ }
+
+ return r;
+ }
+
+ @POST
+ @Path("/customers/")
+ public Response addCustomer(Customer customer) {
+ customer.setId(++currentId);
+
+ customers.put(customer.getId(), customer);
+
+ return Response.ok(customer).build();
+ }
+
+ @POST
+ @Path("/customersUniqueResponseCode/")
+ public Response addCustomerUniqueResponseCode(Customer customer) {
+ customer.setId(++currentId);
+
+ customers.put(customer.getId(), customer);
+
+ return Response.status(201).entity(customer).build();
+ }
+
+ @DELETE
+ @Path("/customers/{id}/")
+ public Response deleteCustomer(@PathParam("id") String id) {
+ long idNumber = Long.parseLong(id);
+ Customer c = customers.get(idNumber);
+
+ Response r;
+ if (c != null) {
+ r = Response.ok().build();
+ customers.remove(idNumber);
+ } else {
+ r = Response.notModified().build();
+ }
+
+ return r;
+ }
+
+ @Path("/orders/{orderId}/")
+ public Order getOrder(@PathParam("orderId") String orderId) {
+ long idNumber = Long.parseLong(orderId);
+ Order c = orders.get(idNumber);
+ return c;
+ }
+
+ final void init() {
+ Customer c = new Customer();
+ c.setName("John");
+ c.setId(123);
+ customers.put(c.getId(), c);
+
+ c = new Customer();
+ c.setName("Dan");
+ c.setId(113);
+ customers.put(c.getId(), c);
+
+ Order o = new Order();
+ o.setDescription("order 223");
+ o.setId(223);
+ orders.put(o.getId(), o);
+ }
+
+}
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java Wed Jun 1 14:28:29 2011
@@ -0,0 +1,71 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf.jaxrs.testbean;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ *
+ * @version
+ */
+@XmlRootElement(name = "Order")
+public class Order {
+ private long id;
+ private String description;
+ private Map<Long, Product> products = new HashMap<Long, Product>();
+
+ public Order() {
+ init();
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String d) {
+ this.description = d;
+ }
+
+ @GET
+ @Path("products/{productId}/")
+ public Product getProduct(@PathParam("productId")int productId) {
+ Product p = products.get(new Long(productId));
+ return p;
+ }
+
+ final void init() {
+ Product p = new Product();
+ p.setId(323);
+ p.setDescription("product 323");
+ products.put(p.getId(), p);
+ }
+
+}
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java (from r1130060, camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java?p2=camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java&p1=camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java&r1=1130060&r2=1130160&rev=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java Wed Jun 1 14:28:29 2011
@@ -14,15 +14,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cxf.transport.spring;
+package org.apache.camel.component.cxf.jaxrs.testbean;
-import org.apache.camel.component.cxf.transport.CamelDestination;
+import javax.xml.bind.annotation.XmlRootElement;
-public class CamelDestinationDefinitionParser extends AbstractCamelContextBeanDefinitionParser {
+/**
+ *
+ * @version
+ */
+@XmlRootElement(name = "Product")
+public class Product {
+ private long id;
+ private String description;
+
+ public long getId() {
+ return id;
+ }
- public CamelDestinationDefinitionParser() {
- super();
- setBeanClass(CamelDestination.class);
+ public void setId(long id) {
+ this.id = id;
}
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String d) {
+ this.description = d;
+ }
}
Copied: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java (from r1130060, camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java?p2=camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java&p1=camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java&r1=1130060&r2=1130160&rev=1130160&view=diff
==============================================================================
(empty)
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java (from r1130060, camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java?p2=camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java&p1=camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java&r1=1130060&r2=1130160&rev=1130160&view=diff
==============================================================================
(empty)
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigureTest.java (from r1130060, camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigureTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigureTest.java?p2=camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigureTest.java&p1=camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigureTest.java&r1=1130060&r2=1130160&rev=1130160&view=diff
==============================================================================
(empty)
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigureTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigureTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java (from r1130060, camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java?p2=camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java&p1=camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java&r1=1130060&r2=1130160&rev=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java Wed Jun 1 14:28:29 2011
@@ -18,7 +18,6 @@ package org.apache.camel.component.cxf.t
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.cxf.HelloService;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java (from r1130060, camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java?p2=camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java&p1=camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java&r1=1130060&r2=1130160&rev=1130160&view=diff
==============================================================================
(empty)
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/HelloService.java (from r1130060, camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/HelloService.java?p2=camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/HelloService.java&p1=camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java&r1=1130060&r2=1130160&rev=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/HelloService.java Wed Jun 1 14:28:29 2011
@@ -14,15 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cxf.transport.spring;
+package org.apache.camel.component.cxf.transport;
-import org.apache.camel.component.cxf.transport.CamelDestination;
+import java.util.List;
-public class CamelDestinationDefinitionParser extends AbstractCamelContextBeanDefinitionParser {
+public interface HelloService {
+ String sayHello();
- public CamelDestinationDefinitionParser() {
- super();
- setBeanClass(CamelDestination.class);
- }
+ void ping();
-}
+ int getInvocationCount();
+
+ String echo(String text) throws Exception;
+
+ Boolean echoBoolean(Boolean bool);
+
+ String complexParameters(List<String> par1, List<String> par2);
+
+}
\ No newline at end of file
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/HelloService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/HelloService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelConduitTest.java (from r1130060, camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelConduitTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelConduitTest.java?p2=camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelConduitTest.java&p1=camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelConduitTest.java&r1=1130060&r2=1130160&rev=1130160&view=diff
==============================================================================
(empty)
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelConduitTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelConduitTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JbiServiceProcessor.java (from r1130060, camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/JbiServiceProcessor.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JbiServiceProcessor.java?p2=camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JbiServiceProcessor.java&p1=camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/JbiServiceProcessor.java&r1=1130060&r2=1130160&rev=1130160&view=diff
==============================================================================
(empty)
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JbiServiceProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JbiServiceProcessor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/ProxyProcessor.java (from r1130060, camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/ProxyProcessor.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/ProxyProcessor.java?p2=camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/ProxyProcessor.java&p1=camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/ProxyProcessor.java&r1=1130060&r2=1130160&rev=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/ProxyProcessor.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/ProxyProcessor.java Wed Jun 1 14:28:29 2011
@@ -20,7 +20,6 @@ package org.apache.camel.component.cxf.t
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.component.cxf.HelloService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/ProxyProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/ProxyProcessor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java Wed Jun 1 14:28:29 2011
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.wsdl_first;
+
+import javax.jws.WebService;
+import javax.xml.ws.Holder;
+
+@WebService(serviceName = "PersonService",
+ targetNamespace = "http://camel.apache.org/wsdl-first",
+ endpointInterface = "org.apache.camel.wsdl_first.Person")
+public class PersonImpl implements Person {
+
+ public void getPerson(Holder<String> personId, Holder<String> ssn,
+ Holder<String> name) throws UnknownPersonFault {
+ if (personId.value == null || personId.value.length() == 0) {
+ org.apache.camel.wsdl_first.types.UnknownPersonFault
+ fault = new org.apache.camel.wsdl_first.types.UnknownPersonFault();
+ fault.setPersonId(personId.value);
+ throw new UnknownPersonFault("Get the null value of person name", fault);
+ }
+ name.value = "Bonjour";
+ ssn.value = "000-000-0000";
+ }
+
+}
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java Wed Jun 1 14:28:29 2011
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.wsdl_first;
+
+import javax.jws.WebService;
+import javax.xml.ws.Holder;
+
+@WebService(serviceName = "PersonService",
+ targetNamespace = "http://camel.apache.org/wsdl-first",
+ wsdlLocation = "http://localhost:9090/customerservice/customers?wsdl",
+ endpointInterface = "org.apache.camel.wsdl_first.Person")
+public class PersonImplWithWsdl implements Person {
+
+ private String reply = "Bonjour";
+
+ public void getPerson(Holder<String> personId, Holder<String> ssn,
+ Holder<String> name) throws UnknownPersonFault {
+ if (personId.value == null || personId.value.length() == 0) {
+ org.apache.camel.wsdl_first.types.UnknownPersonFault
+ fault = new org.apache.camel.wsdl_first.types.UnknownPersonFault();
+ fault.setPersonId(personId.value);
+ throw new UnknownPersonFault("Get the null value of person name", fault);
+ }
+ name.value = reply;
+ ssn.value = "000-000-0000";
+ }
+
+ public String getReply() {
+ return reply;
+ }
+
+ public void setReply(String reply) {
+ this.reply = reply;
+ }
+}
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-cxf-transport/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/resources/log4j.properties?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/resources/log4j.properties (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/resources/log4j.properties Wed Jun 1 14:28:29 2011
@@ -0,0 +1,39 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=INFO, file
+
+log4j.logger.org.apache.activemq.spring=WARN
+#log4j.logger.org.apache.camel.component=TRACE
+log4j.logger.org.apache.camel.impl.converter=WARN
+log4j.logger.org.apache.camel.component.cxf=INFO
+#log4j.logger.org.apache.camel.processor.Pipeline=TRACE
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-35.35t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.file.file=target/camel-cxf-transport-test.log
+log4j.appender.file.append=true
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-cxf-transport/src/test/resources/logging.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/resources/logging.properties?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/resources/logging.properties (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/resources/logging.properties Wed Jun 1 14:28:29 2011
@@ -0,0 +1,75 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+############################################################
+# Default Logging Configuration File
+#
+# You can use a different file by specifying a filename
+# with the java.util.logging.config.file system property.
+# For example java -Djava.util.logging.config.file=myfile
+############################################################
+
+############################################################
+# Global properties
+############################################################
+
+# "handlers" specifies a comma separated list of log Handler
+# classes. These handlers will be installed during VM startup.
+# Note that these classes must be on the system classpath.
+# By default we only configure a ConsoleHandler, which will only
+# show messages at the INFO and above levels.
+#handlers= java.util.logging.ConsoleHandler
+
+# To also add the FileHandler, use the following line instead.
+#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+
+# Default global logging level.
+# This specifies which kinds of events are logged across
+# all loggers. For any given facility this global level
+# can be overriden by a facility specific level
+# Note that the ConsoleHandler also has a separate level
+# setting to limit messages printed to the console.
+.level= INFO
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+# default file output is in user's home directory.
+java.util.logging.FileHandler.pattern = %h/java%u.log
+java.util.logging.FileHandler.limit = 5000000
+java.util.logging.FileHandler.count = 1
+java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
+
+# Limit the message that are printed on the console to INFO and above.
+java.util.logging.ConsoleHandler.level = FINEST
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+# For example, set the com.xyz.foo logger to only log SEVERE
+# messages:
+#com.xyz.foo.level = SEVERE
+#org.apache.cxf.level = FINEST
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/logging.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/logging.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml Wed Jun 1 14:28:29 2011
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://camel.apache.org/schema/cxf"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:camel="http://cxf.apache.org/transports/camel"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.xsd
+ ">
+ <import resource="classpath:META-INF/cxf/camel/cxf-extension-camel.xml" />
+
+ <!-- START SNIPPET: beanDefinition -->
+ <util:list id="customerServiceBean">
+ <bean class="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService" />
+ </util:list>
+
+ <bean class="org.apache.camel.wsdl_first.PersonImpl" id="jaxwsBean" />
+
+ <!-- END SNIPPET: beanDefinition -->
+
+ <cxf:cxfEndpoint id="routerEndpoint"
+ address="http://localhost:8092/PersonService/" serviceClass="org.apache.camel.wsdl_first.Person"
+ endpointName="person:soap" serviceName="person:PersonService" wsdlURL="person.wsdl"
+ xmlns:person="http://camel.apache.org/wsdl-first">
+ </cxf:cxfEndpoint>
+
+ <cxf:cxfEndpoint id="serviceEndpoint"
+ address="camel://direct:camel.apache.org.wsdl-first.PersonService" serviceClass="org.apache.camel.wsdl_first.Person"
+ endpointName="person:soap3" serviceName="person:PersonService"
+ wsdlURL="person.wsdl"
+ xmlns:person="http://camel.apache.org/wsdl-first">
+ </cxf:cxfEndpoint>
+
+ <!-- setup our error handler as the deal letter channel -->
+ <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <property name="deadLetterUri" value="mock:error"/>
+ <property name="redeliveryPolicy" ref="myRedeliveryPolicy"/>
+ </bean>
+
+ <bean id="myRedeliveryPolicy" class="org.apache.camel.processor.RedeliveryPolicy">
+ <property name="maximumRedeliveries" value="5"/>
+ <property name="redeliveryDelay" value="0"/>
+ </bean>
+
+ <camelContext errorHandlerRef="errorHandler" id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="cxf:bean:routerEndpoint?dataFormat=PAYLOAD" />
+ <to uri="cxf:bean:serviceEndpoint?dataFormat=PAYLOAD" />
+ </route>
+ <!-- START SNIPPET: routeDefinition -->
+ <route>
+ <from uri="jetty:http://localhost:9000?matchOnUriPrefix=true" />
+ <to uri="cxfbean:customerServiceBean" />
+ </route>
+ <!-- END SNIPPET: routeDefinition -->
+ <route>
+ <from uri="jetty:http://localhost:9090?matchOnUriPrefix=true" />
+ <to uri="cxfbean:jaxwsBean" />
+ </route>
+ <!-- Provide an RS route for the purposes of testing that providers are added -->
+ <route>
+ <from uri="direct:start" />
+ <to uri="cxfbean:customerServiceBean?providers=#provider1,#provider2" />
+ </route>
+ </camelContext>
+
+ <!-- A couple of beans to declare as providers -
+ they can be an object of any kind for the purposes of our test. -->
+ <bean id="provider1" class="java.lang.String" />
+ <bean id="provider2" class="java.lang.String" />
+
+ <camel:conduit name="{http://camel.apache.org/wsdl-first}soap3.camel-conduit">
+ <camelContext id="PersonServiceClientContext" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="direct:camel.apache.org.wsdl-first.PersonService"/>
+ <to uri="cxfbean:jaxwsBean"/>
+ </route>
+ </camelContext>
+ </camel:conduit>
+
+</beans>
\ No newline at end of file
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest-context.xml?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest-context.xml (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest-context.xml Wed Jun 1 14:28:29 2011
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ ">
+
+ <bean class="org.apache.camel.wsdl_first.PersonImplWithWsdl" id="jaxwsBean">
+ <property name="reply" value="Bye"/>
+ </bean>
+
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="jetty:http://localhost:9090?matchOnUriPrefix=true" />
+ <to uri="cxfbean:jaxwsBean" />
+ </route>
+ </camelContext>
+
+</beans>
\ No newline at end of file
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest-context.xml?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest-context.xml (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest-context.xml Wed Jun 1 14:28:29 2011
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ ">
+
+ <bean class="org.apache.camel.wsdl_first.PersonImplWithWsdl" id="jaxwsBean" />
+
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="jetty:http://localhost:9090?matchOnUriPrefix=true" />
+ <to uri="cxfbean:jaxwsBean" />
+ </route>
+ </camelContext>
+
+</beans>
\ No newline at end of file
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelConduit.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelConduit.xml?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelConduit.xml (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelConduit.xml Wed Jun 1 14:28:29 2011
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:camel="http://cxf.apache.org/transports/camel"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.xsd
+ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/cxfEndpoint.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <camelContext id="conduit_context" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="direct:EndpointA" />
+ <to uri="direct:EndpointB" />
+ </route>
+ </camelContext>
+
+ <camel:conduit name="{http://camel.apache.org/camel-test}portA.camel-conduit">
+ <camel:camelContextRef>conduit_context</camel:camelContextRef>
+ </camel:conduit>
+ <!-- START SNIPPET: example -->
+ <camel:conduit name="{http://camel.apache.org/camel-test}portB.camel-conduit">
+ <camelContext id="context" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="direct:EndpointC" />
+ <to uri="direct:EndpointD" />
+ </route>
+ </camelContext>
+ </camel:conduit>
+ <!-- END SNIPPET: example -->
+
+</beans>
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelConduit.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelConduit.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelConduit.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelDestination.xml (from r1130060, camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/SpringBusFactoryBeans.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelDestination.xml?p2=camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelDestination.xml&p1=camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/SpringBusFactoryBeans.xml&r1=1130060&r2=1130160&rev=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/SpringBusFactoryBeans.xml (original)
+++ camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelDestination.xml Wed Jun 1 14:28:29 2011
@@ -17,20 +17,27 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:cxf="http://camel.apache.org/schema/cxf"
+ xmlns:camel="http://cxf.apache.org/transports/camel"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.xsd
+ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/cxfEndpoint.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
-
- <bean id="cxfBus" class="org.apache.camel.component.cxf.spring.SpringBusFactoryBean">
- <property name="cfgFiles" value="META-INF/cxf/cxf.xml;META-INF/cxf/cxf-extension-soap.xml;META-INF/cxf/cxf-extension-http-jetty.xml" />
- <property name="includeDefaultBus" value="false" />
- </bean>
-
- <bean id="myBus" class="org.apache.camel.component.cxf.spring.SpringBusFactoryBean">
- <property name="cfgFiles" value="META-INF/cxf/cxf-extension-soap.xml" />
- <property name="includeDefaultBus" value="true" />
- </bean>
+
+
+ <camel:destination name="{http://camel.apache.org/camel-test}port.camel-destination">
+ <camelContext id="dest_context" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="direct:EndpointA"/>
+ <to uri="direct:EndpointB"/>
+ </route>
+ <route>
+ <from uri="direct:EndpointC"/>
+ <to uri="mock:EndpiontB"/>
+ </route>
+ </camelContext>
+ </camel:destination>
</beans>
Added: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigure.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigure.xml?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigure.xml (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigure.xml Wed Jun 1 14:28:29 2011
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://camel.apache.org/schema/cxf"
+ xmlns:camel="http://cxf.apache.org/transports/camel"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.xsd
+ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+ <camel:destination name="{http://apache.org/hello_world_soap_http}SoapPort.camel-destination">
+ <camelContext id="camel_destination" xmlns="http://camel.apache.org/schema/spring">
+ </camelContext>
+ </camel:destination>
+
+ <camel:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.camel-conduit">
+ <camelContext id="camel_conduit" xmlns="http://camel.apache.org/schema/spring">
+ </camelContext>
+ </camel:conduit>
+
+ <cxf:cxfEndpoint id="routerEndpoint" address="camel://direct://Endpoint"
+ serviceClass="org.apache.hello_world_soap_http.Greeter"
+ endpointName="s:SoapPort"
+ serviceName="s:SOAPService"
+ xmlns:s="http://apache.org/hello_world_soap_http"
+ transportId="http://cxf.apache.org/transports/camel">
+ </cxf:cxfEndpoint>
+
+ <cxf:cxfEndpoint id="serviceEndpoint" address="camel://direct://service"
+ serviceClass="org.apache.hello_world_soap_http.Greeter"
+ endpointName="s:SoapPort"
+ serviceName="s:SOAPService"
+ xmlns:s="http://apache.org/hello_world_soap_http">
+ </cxf:cxfEndpoint>
+
+</beans>
\ No newline at end of file
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigure.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigure.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigure.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml Wed Jun 1 14:28:29 2011
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:camel="http://cxf.apache.org/transports/camel"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.xsd
+ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/cxfEndpoint.xsd
+ http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <import resource="classpath:META-INF/cxf/cxf.xml"/>
+ <import resource="classpath:META-INF/cxf/cxf-extension-jbi-binding.xml"/>
+ <import resource="classpath:META-INF/cxf/camel/cxf-extension-camel.xml"/>
+
+
+ <camelContext id="conduit_context" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="direct://jbiStart"/>
+ <process ref="proxyProcessor"/>
+ </route>
+ <route>
+ <from uri="direct://jbiService" />
+ <process ref="serviceProcessor" />
+ </route>
+ </camelContext>
+
+ <camel:conduit name="{http://cxf.component.camel.apache.org}portA.camel-conduit">
+ <camel:camelContextRef>conduit_context</camel:camelContextRef>
+ </camel:conduit>
+
+ <bean id="proxyProcessor" class="org.apache.camel.component.cxf.transport.ProxyProcessor">
+ <property name="helloService" ref="client"/>
+ </bean>
+
+ <bean id="serviceProcessor" class="org.apache.camel.component.cxf.transport.JbiServiceProcessor"/>
+
+ <simple:client id="client"
+ serviceClass="org.apache.camel.component.cxf.transport.HelloService"
+ address="camel://direct://jbiService"
+ serviceName="s:service"
+ xmlns:s="http://cxf.component.camel.apache.org"
+ endpointName="s:portA"
+ bindingId="http://cxf.apache.org/bindings/jbi"
+ transportId="http://cxf.apache.org/transports/camel">
+ </simple:client>
+
+</beans>
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: camel/trunk/components/camel-cxf-transport/src/test/resources/person.wsdl
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/resources/person.wsdl?rev=1130160&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/resources/person.wsdl (added)
+++ camel/trunk/components/camel-cxf-transport/src/test/resources/person.wsdl Wed Jun 1 14:28:29 2011
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<wsdl:definitions name="wsdl-first"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:tns="http://camel.apache.org/wsdl-first"
+ xmlns:typens="http://camel.apache.org/wsdl-first/types"
+ targetNamespace="http://camel.apache.org/wsdl-first">
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://camel.apache.org/wsdl-first/types"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://camel.apache.org/wsdl-first/types"
+ elementFormDefault="qualified">
+
+ <simpleType name="MyStringType">
+ <restriction base="string">
+ <maxLength value="30" />
+ </restriction>
+ </simpleType>
+
+
+ <xsd:element name="GetPerson">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="personId" type="tns:MyStringType"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="GetPersonResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="personId" type="tns:MyStringType"/>
+ <xsd:element name="ssn" type="xsd:string"/>
+ <xsd:element name="name" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="UnknownPersonFault">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="personId" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="StringInputElem" type="xsd:string" />
+ <xsd:element name="IntegerInputElem" type="xsd:int" />
+
+ <xsd:element name="StringOutputElem" type="xsd:string" />
+ <xsd:element name="IntegerOutputElem" type="xsd:int" />
+
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="GetPersonRequest">
+ <wsdl:part name="payload" element="typens:GetPerson"/>
+ </wsdl:message>
+ <wsdl:message name="GetPersonResponse">
+ <wsdl:part name="payload" element="typens:GetPersonResponse"/>
+ </wsdl:message>
+ <wsdl:message name="UnknownPersonFault">
+ <wsdl:part name="payload" element="typens:UnknownPersonFault"/>
+ </wsdl:message>
+
+ <wsdl:message name="GetPersonMultiPartRequest">
+ <wsdl:part name="nameIn" element="typens:StringInputElem" />
+ <wsdl:part name="ssnIn" element="typens:IntegerInputElem" />
+ </wsdl:message>
+ <wsdl:message name="GetPersonMultiPartResponse">
+ <wsdl:part name="nameOut" element="typens:StringOutputElem" />
+ <wsdl:part name="ssnOut" element="typens:IntegerOutputElem" />
+ </wsdl:message>
+
+ <wsdl:portType name="Person">
+ <wsdl:operation name="GetPerson">
+ <wsdl:input message="tns:GetPersonRequest"/>
+ <wsdl:output message="tns:GetPersonResponse"/>
+ <wsdl:fault name="UnknownPerson" message="tns:UnknownPersonFault"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:portType name="PersonMultiPartPortType">
+ <wsdl:operation name="GetPersonMultiPartOperation">
+ <wsdl:input message="tns:GetPersonMultiPartRequest" />
+ <wsdl:output message="tns:GetPersonMultiPartResponse" />
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="PersonSOAPBinding" type="tns:Person">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="GetPerson">
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ <wsdl:fault name="UnknownPerson">
+ <soap:fault use="literal" name="UnknownPerson" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="PersonSOAPBinding12" type="tns:Person">
+ <soap12:binding transport="http://www.w3.org/2003/05/soap/bindings/HTTP/" style="document" />
+ <wsdl:operation name="GetPerson">
+ <soap12:operation style="document" soapAction="GetPersonAction"/>
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ <wsdl:fault name="UnknownPerson">
+ <soap12:fault use="literal" name="UnknownPerson" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="PersonSOAPBinding2" type="tns:Person">
+ <soap:binding style="document" transport="http://cxf.apache.org/transports/camel" />
+ <wsdl:operation name="GetPerson">
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ <wsdl:fault name="UnknownPerson">
+ <soap:fault use="literal" name="UnknownPerson" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="PersonMultiPartSOAPBinding"
+ type="tns:PersonMultiPartPortType">
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="GetPersonMultiPartOperation">
+ <soap:operation soapAction="" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="PersonService">
+ <wsdl:port binding="tns:PersonSOAPBinding" name="soap">
+ <soap:address location="http://localhost:8092/PersonService/" />
+ </wsdl:port>
+ <wsdl:port binding="tns:PersonSOAPBinding" name="soap2">
+ <soap:address location="http://localhost:8093/PersonService/" />
+ </wsdl:port>
+ <wsdl:port binding="tns:PersonSOAPBinding2" name="soap3">
+ <soap:address location="camel://direct:camel.apache.org.wsdl-first.PersonService"/>
+ </wsdl:port>
+ </wsdl:service>
+
+ <wsdl:service name="PersonService12">
+ <wsdl:port binding="tns:PersonSOAPBinding12" name="soap">
+ <soap12:address location="http://localhost:8092/PersonService/" />
+ </wsdl:port>
+ </wsdl:service>
+
+ <wsdl:service name="PersonMultiPartService">
+ <wsdl:port name="PersonMultiPartPort" binding="tns:PersonMultiPartSOAPBinding">
+ <soap:address location="http://localhost:9000/PersonMultiPart" />
+ </wsdl:port>
+ </wsdl:service>
+
+</wsdl:definitions>
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/person.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/person.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-cxf-transport/src/test/resources/person.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=1130160&r1=1130159&r2=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Wed Jun 1 14:28:29 2011
@@ -57,8 +57,7 @@
</camel.osgi.import>
<camel.osgi.export>
- org.apache.camel.component.cxf.*;${camel.osgi.version};-split-package:=merge-first,
- '=META-INF.cxf.camel'
+ org.apache.camel.component.cxf.*;${camel.osgi.version};-split-package:=merge-first
</camel.osgi.export>
<camel.osgi.failok>true</camel.osgi.failok>
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java?rev=1130160&r1=1130159&r2=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java Wed Jun 1 14:28:29 2011
@@ -39,11 +39,16 @@ public interface CxfConstants {
String OPERATION_NAME = "operationName";
String OPERATION_NAMESPACE = "operationNamespace";
String SPRING_CONTEXT_ENDPOINT = "bean:";
+ @Deprecated
+ // This constants will be removed in Camel 3.0
+ // Please use that one in camel-cxf-transport
String CAMEL_TRANSPORT_PREFIX = "camel:";
String JAXWS_CONTEXT = "jaxwsContext";
+ @Deprecated
String CXF_EXCHANGE = "org.apache.cxf.message.exchange";
String DISPATCH_NAMESPACE = "http://camel.apache.org/cxf/jaxws/dispatch";
String DISPATCH_DEFAULT_OPERATION_NAMESPACE = "Invoke";
+ @Deprecated
String CAMEL_EXCHANGE = "org.apache.camel.exchange";
String CAMEL_CXF_MESSAGE = "CamelCxfMessage";
String CAMEL_CXF_RS_USING_HTTP_API = "CamelCxfRsUsingHttpAPI";
Modified: camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.handlers?rev=1130160&r1=1130159&r2=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.handlers (original)
+++ camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.handlers Wed Jun 1 14:28:29 2011
@@ -18,5 +18,4 @@
# under the License.
#
#
-http\://camel.apache.org/schema/cxf=org.apache.camel.component.cxf.spring.NamespaceHandler
-http\://cxf.apache.org/transports/camel=org.apache.camel.component.cxf.transport.spring.NamespaceHandler
\ No newline at end of file
+http\://camel.apache.org/schema/cxf=org.apache.camel.component.cxf.spring.NamespaceHandler
\ No newline at end of file
Modified: camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas?rev=1130160&r1=1130159&r2=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas (original)
+++ camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas Wed Jun 1 14:28:29 2011
@@ -33,6 +33,3 @@ http\://camel.apache.org/schema/cxf/came
http\://camel.apache.org/schema/cxf/camel-cxf-2.7.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.7.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${pom.version}.xsd=schema/cxfEndpoint.xsd
-
-# since we don't publish the camel schema in the cxf site, we will always use the schema file in the class path
-http\://cxf.apache.org/transports/camel.xsd=schema/configuration/camel.xsd
\ No newline at end of file
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java?rev=1130160&r1=1130159&r2=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java Wed Jun 1 14:28:29 2011
@@ -67,7 +67,6 @@ public class DefaultCxfBindingTest exten
cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy());
Exchange exchange = new DefaultExchange(context);
org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
- exchange.setProperty(CxfConstants.CXF_EXCHANGE, cxfExchange);
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
Map<String, Object> requestContext = new HashMap<String, Object>();
@@ -102,7 +101,6 @@ public class DefaultCxfBindingTest exten
cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy());
Exchange exchange = new DefaultExchange(context);
org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
- exchange.setProperty(CxfConstants.CXF_EXCHANGE, cxfExchange);
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
Map<String, Object> responseContext = new HashMap<String, Object>();
responseContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, Integer.valueOf(200));
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBeanTest.java?rev=1130160&r1=1130159&r2=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBeanTest.java Wed Jun 1 14:28:29 2011
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.cxf.spring;
-import org.apache.camel.component.cxf.transport.CamelTransportFactory;
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapBindingFactory;
import org.apache.cxf.version.Version;
@@ -33,17 +32,10 @@ public class SpringBusFactoryBeanTest ex
public void getTheBusInstance() {
Bus bus = (Bus)ctx.getBean("cxfBus");
assertNotNull("The bus should not be null", bus);
- if (Version.getCurrentVersion().startsWith("2.3")) {
- // This test just for the CXF 2.3.x, we skip this test with CXF 2.4.x
- CamelTransportFactory factory = bus.getExtension(CamelTransportFactory.class);
- assertNull("You should not find the factory here", factory);
- }
bus = (Bus)ctx.getBean("myBus");
assertNotNull("The bus should not be null", bus);
- CamelTransportFactory factory = bus.getExtension(CamelTransportFactory.class);
- assertNotNull("You should find the factory here", factory);
SoapBindingFactory soapBindingFactory = bus.getExtension(SoapBindingFactory.class);
assertNotNull("You should find the factory here", soapBindingFactory);
}
Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/SpringBusFactoryBeans.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/SpringBusFactoryBeans.xml?rev=1130160&r1=1130159&r2=1130160&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/SpringBusFactoryBeans.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/SpringBusFactoryBeans.xml Wed Jun 1 14:28:29 2011
@@ -24,7 +24,7 @@
">
<bean id="cxfBus" class="org.apache.camel.component.cxf.spring.SpringBusFactoryBean">
- <property name="cfgFiles" value="META-INF/cxf/cxf.xml;META-INF/cxf/cxf-extension-soap.xml;META-INF/cxf/cxf-extension-http-jetty.xml" />
+ <property name="cfgFiles" value="META-INF/cxf/cxf.xml;META-INF/cxf/cxf-extension-soap.xml" />
<property name="includeDefaultBus" value="false" />
</bean>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1130160&r1=1130159&r2=1130160&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jun 1 14:28:29 2011
@@ -303,6 +303,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cxf-transport</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-eclipse</artifactId>
<version>${project.version}</version>