Author: ningjiang Date: Sun Apr 28 08:16:37 2013 New Revision: 1476733 URL: http://svn.apache.org/r1476733 Log: CAMEL-6322 Fixed the warning issues of camel-example-cxf-osgi and camel-example-blueprint-osgi Merged revisions 1476722 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.11.x
................ r1476722 | ningjiang | 2013-04-28 14:48:44 +0800 (Sun, 28 Apr 2013) | 10 lines 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.10.x/ (props changed) camel/branches/camel-2.10.x/components/camel-http/ (props changed) camel/branches/camel-2.10.x/components/camel-jms/ (props changed) camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/pom.xml camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml Propchange: camel/branches/camel-2.10.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1476545 Merged /camel/branches/camel-2.11.x:r1476722 Propchange: camel/branches/camel-2.10.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Propchange: camel/branches/camel-2.10.x/components/camel-http/ ------------------------------------------------------------------------------ Merged /camel/branches/camel-2.11.x/components/camel-http:r1476722 Propchange: camel/branches/camel-2.10.x/components/camel-jms/ ------------------------------------------------------------------------------ Merged /camel/branches/camel-2.11.x/components/camel-jms:r1476722 Modified: camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/pom.xml?rev=1476733&r1=1476732&r2=1476733&view=diff ============================================================================== --- camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/pom.xml (original) +++ camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/pom.xml Sun Apr 28 08:16:37 2013 @@ -62,6 +62,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.10.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.10.x/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl?rev=1476733&r1=1476732&r2=1476733&view=diff ============================================================================== --- camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl (original) +++ camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl Sun Apr 28 08:16:37 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.10.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.10.x/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml?rev=1476733&r1=1476732&r2=1476733&view=diff ============================================================================== --- camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml (original) +++ camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml Sun Apr 28 08:16:37 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.10.x/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml?rev=1476733&r1=1476732&r2=1476733&view=diff ============================================================================== --- camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml (original) +++ camel/branches/camel-2.10.x/examples/camel-example-cxf-blueprint/src/test/resources/camel-context.xml Sun Apr 28 08:16:37 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.10.x/examples/camel-example-cxf-osgi/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml?rev=1476733&r1=1476732&r2=1476733&view=diff ============================================================================== --- camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml (original) +++ camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml Sun Apr 28 08:16:37 2013 @@ -72,6 +72,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.10.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.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml?rev=1476733&r1=1476732&r2=1476733&view=diff ============================================================================== --- camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml (original) +++ camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml Sun Apr 28 08:16:37 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.10.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.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl?rev=1476733&r1=1476732&r2=1476733&view=diff ============================================================================== --- camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl (original) +++ camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl Sun Apr 28 08:16:37 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.10.x/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml?rev=1476733&r1=1476732&r2=1476733&view=diff ============================================================================== --- camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml (original) +++ camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml Sun Apr 28 08:16:37 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" />
