Author: ningjiang
Date: Fri Aug 5 03:55:43 2011
New Revision: 1154087
URL: http://svn.apache.org/viewvc?rev=1154087&view=rev
Log:
Merged revisions 1153323 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1153323 | ningjiang | 2011-08-03 10:59:30 +0800 (Wed, 03 Aug 2011) | 1 line
CAMEL-4294 Fixed the WSDL generation issue of Camel 2.8.0
........
Added:
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/
- copied from r1153323,
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/Order.java
- copied unchanged from r1153323,
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/Order.java
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
- copied unchanged from r1153323,
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/OrderTest.java
- copied unchanged from r1153323,
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/OrderTest.java
camel/branches/camel-2.8.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsdl/
- copied from r1153323,
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsdl/
camel/branches/camel-2.8.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsdl/camel-cxf.xml
- copied unchanged from r1153323,
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsdl/camel-cxf.xml
camel/branches/camel-2.8.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsdl/camel-route.xml
- copied unchanged from r1153323,
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsdl/camel-route.xml
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/branches/camel-2.8.x/components/camel-http/ (props changed)
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
svn:mergeinfo = /camel/trunk:1153323
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 5 03:55:43 2011
@@ -1 +1 @@
-/camel/trunk:1-1151940
+/camel/trunk:1-1151940,1153323
Modified:
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1154087&r1=1154086&r2=1154087&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Fri Aug 5 03:55:43 2011
@@ -120,7 +120,7 @@ public class CxfEndpoint extends Default
= new ModCountCopyOnWriteArrayList<AbstractFeature>();
private List<Handler> handlers;
- private List<String> schemaLocations = new ArrayList<String>();
+ private List<String> schemaLocations;
private String transportId;
private String bindingId;
@@ -182,13 +182,19 @@ public class CxfEndpoint extends Default
sfb.setOutFaultInterceptors(outFault);
sfb.setInFaultInterceptors(inFault);
sfb.setFeatures(features);
- sfb.setSchemaLocations(schemaLocations);
+ if (schemaLocations != null) {
+ sfb.setSchemaLocations(schemaLocations);
+ }
if (sfb instanceof JaxWsServerFactoryBean && handlers != null) {
((JaxWsServerFactoryBean)sfb).setHandlers(handlers);
}
- sfb.setTransportId(transportId);
- sfb.setBindingId(bindingId);
+ if (transportId != null) {
+ sfb.setTransportId(transportId);
+ }
+ if (bindingId != null) {
+ sfb.setBindingId(bindingId);
+ }
// wsdl url
if (getWsdlURL() != null) {
@@ -312,9 +318,13 @@ public class CxfEndpoint extends Default
if (factoryBean instanceof JaxWsProxyFactoryBean && handlers != null) {
((JaxWsProxyFactoryBean)factoryBean).setHandlers(handlers);
- }
- factoryBean.setTransportId(transportId);
- factoryBean.setBindingId(bindingId);
+ }
+ if (transportId != null) {
+ factoryBean.setTransportId(transportId);
+ }
+ if (bindingId != null) {
+ factoryBean.setBindingId(bindingId);
+ }
// address
factoryBean.setAddress(getAddress());
Propchange: camel/branches/camel-2.8.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 5 03:55:43 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526
+/camel/trunk/components/camel-http:917526,1153323
