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 2013/04/27 12:03:29 UTC
svn commit: r1476545 - in /camel/trunk/examples: camel-example-cxf-blueprint/
camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/
camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/
camel-example-cxf-blueprint/src/test/resource...
Author: ningjiang
Date: Sat Apr 27 10:03:28 2013
New Revision: 1476545
URL: http://svn.apache.org/r1476545
Log:
CAMEL-6322 Fixed the warning issues of camel-example-cxf-osgi and camel-example-blueprint-osgi
Modified:
camel/trunk/examples/camel-example-cxf-blueprint/pom.xml
camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml
camel/trunk/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml
camel/trunk/examples/camel-example-cxf-osgi/pom.xml
camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl
camel/trunk/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml
Modified: camel/trunk/examples/camel-example-cxf-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-blueprint/pom.xml?rev=1476545&r1=1476544&r2=1476545&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-blueprint/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf-blueprint/pom.xml Sat Apr 27 10:03:28 2013
@@ -61,6 +61,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jaxb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl?rev=1476545&r1=1476544&r2=1476545&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl (original)
+++ camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl Sat Apr 27 10:03:28 2013
@@ -84,7 +84,7 @@
<!-- Service definition -->
<wsdl:service name="ReportIncidentEndpointService">
- <wsdl:port name="ReportIncidentService" binding="tns:ReportIncidentBinding">
+ <wsdl:port name="ReportIncidentEndpoint" binding="tns:ReportIncidentBinding">
<soap:address location="http://localhost:8181/cxf/camel-example-cxf-blueprint/webservices/incident"/>
</wsdl:port>
</wsdl:service>
Modified: camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml?rev=1476545&r1=1476544&r2=1476545&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml (original)
+++ camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml Sat Apr 27 10:03:28 2013
@@ -30,8 +30,11 @@
<camelcxf:cxfEndpoint id="reportIncident"
address="/camel-example-cxf-blueprint/webservices/incident"
+ endpointName="s:ReportIncidentEndpoint"
+ serviceName="s:ReportIncidentEndpointService"
wsdlURL="META-INF/wsdl/report_incident.wsdl"
- serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"/>
+ serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"
+ xmlns:s="http://reportincident.example.camel.apache.org"/>
<bean id="reportIncidentRoutes" class="org.apache.camel.example.reportincident.ReportIncidentRoutes"/>
Modified: camel/trunk/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml?rev=1476545&r1=1476544&r2=1476545&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml (original)
+++ camel/trunk/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml Sat Apr 27 10:03:28 2013
@@ -28,7 +28,10 @@
<cxf:cxfEndpoint id="reportIncident"
address="http://localhost:{{port}}/cxf/camel-example-cxf-blueprint/webservices/incident"
wsdlURL="META-INF/wsdl/report_incident.wsdl"
- serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint">
+ endpointName="s:ReportIncidentEndpoint"
+ serviceName="s:ReportIncidentEndpointService"
+ serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"
+ xmlns:s="http://reportincident.example.camel.apache.org">
</cxf:cxfEndpoint>
<bean id="reportIncidentRoutes" class="org.apache.camel.example.reportincident.ReportIncidentRoutes" />
Modified: camel/trunk/examples/camel-example-cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-osgi/pom.xml?rev=1476545&r1=1476544&r2=1476545&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-osgi/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf-osgi/pom.xml Sat Apr 27 10:03:28 2013
@@ -71,6 +71,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jaxb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml?rev=1476545&r1=1476544&r2=1476545&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml (original)
+++ camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml Sat Apr 27 10:03:28 2013
@@ -27,8 +27,11 @@
<cxf:cxfEndpoint id="reportIncident"
address="/camel-example-cxf-osgi/webservices/incident"
+ endpointName="s:ReportIncidentEndpoint"
+ serviceName="s:ReportIncidentEndpointService"
wsdlURL="META-INF/wsdl/report_incident.wsdl"
- serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"/>
+ serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"
+ xmlns:s="http://reportincident.example.camel.apache.org"/>
<bean id="reportIncidentRoutes" class="org.apache.camel.example.reportincident.ReportIncidentRoutes"/>
Modified: camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl?rev=1476545&r1=1476544&r2=1476545&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl (original)
+++ camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl Sat Apr 27 10:03:28 2013
@@ -84,7 +84,7 @@
<!-- Service definition -->
<wsdl:service name="ReportIncidentEndpointService">
- <wsdl:port name="ReportIncidentService" binding="tns:ReportIncidentBinding">
+ <wsdl:port name="ReportIncidentEndpoint" binding="tns:ReportIncidentBinding">
<soap:address location="http://localhost:9080/part-five/webservices/incident"/>
</wsdl:port>
</wsdl:service>
Modified: camel/trunk/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml?rev=1476545&r1=1476544&r2=1476545&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml (original)
+++ camel/trunk/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml Sat Apr 27 10:03:28 2013
@@ -30,8 +30,11 @@
<cxf:cxfEndpoint id="reportIncident"
address="http://localhost:${port}/cxf/camel-example-cxf-osgi/webservices/incident"
+ endpointName="s:ReportIncidentEndpoint"
+ serviceName="s:ReportIncidentEndpointService"
wsdlURL="META-INF/wsdl/report_incident.wsdl"
- serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint">
+ serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"
+ xmlns:s="http://reportincident.example.camel.apache.org">
</cxf:cxfEndpoint>
<bean id="reportIncidentRoutes" class="org.apache.camel.example.reportincident.ReportIncidentRoutes" />