Author: ningjiang
Date: Sun Apr 28 06:48:44 2013
New Revision: 1476722
URL: http://svn.apache.org/r1476722
Log:
CAMEL-6322 Fixed the warning issues of camel-example-cxf-osgi and
camel-example-blueprint-osgi
Merged revisions 1476545 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1476545 | ningjiang | 2013-04-27 18:03:28 +0800 (Sat, 27 Apr 2013) | 1 line
CAMEL-6322 Fixed the warning issues of camel-example-cxf-osgi and
camel-example-blueprint-osgi
........
Modified:
camel/branches/camel-2.11.x/ (props changed)
camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/pom.xml
camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml
camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml
camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/pom.xml
camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl
camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml
Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1476545
Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Apr 28 06:48:44 2013
@@ -1 +1 @@
-/camel/trunk:1-1468763,1469704,1469819,1470420,1470426-1470427,1470429,1470508,1471293,1471330,1471407-1471408,1471543,1475657,1475677,1475742,1475786,1476113,1476428,1476442,1476448,1476502
+/camel/trunk:1-1468763,1469704,1469819,1470420,1470426-1470427,1470429,1470508,1471293,1471330,1471407-1471408,1471543,1475657,1475677,1475742,1475786,1476113,1476428,1476442,1476448,1476502,1476545
Modified:
camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/pom.xml?rev=1476722&r1=1476721&r2=1476722&view=diff
==============================================================================
--- camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/pom.xml
(original)
+++ camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/pom.xml
Sun Apr 28 06:48:44 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/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl?rev=1476722&r1=1476721&r2=1476722&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
(original)
+++
camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
Sun Apr 28 06:48:44 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/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml?rev=1476722&r1=1476721&r2=1476722&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml
(original)
+++
camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml
Sun Apr 28 06:48:44 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/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml?rev=1476722&r1=1476721&r2=1476722&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml
(original)
+++
camel/branches/camel-2.11.x/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml
Sun Apr 28 06:48:44 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/branches/camel-2.11.x/examples/camel-example-cxf-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/pom.xml?rev=1476722&r1=1476721&r2=1476722&view=diff
==============================================================================
--- camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/pom.xml
(original)
+++ camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/pom.xml Sun Apr
28 06:48:44 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/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml?rev=1476722&r1=1476721&r2=1476722&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
(original)
+++
camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
Sun Apr 28 06:48:44 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/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl?rev=1476722&r1=1476721&r2=1476722&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl
(original)
+++
camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl
Sun Apr 28 06:48:44 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/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml?rev=1476722&r1=1476721&r2=1476722&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml
(original)
+++
camel/branches/camel-2.11.x/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml
Sun Apr 28 06:48:44 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" />
