camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1155277 - in /camel/trunk/tests/camel-itest-osgi/src/test: java/org/apache/camel/itest/osgi/cxf/blueprint/ resources/ resources/org/apache/camel/itest/osgi/cxf/ resources/org/apache/camel/itest/osgi/cxf/blueprint/
Date Tue, 09 Aug 2011 09:21:28 GMT
Author: ningjiang
Date: Tue Aug  9 09:21:28 2011
New Revision: 1155277

URL: http://svn.apache.org/viewvc?rev=1155277&view=rev
Log:
CAMEL-4315 Added OSGi tests for setting endpointName attribute of cxfEndpoint

Modified:
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouter.xml
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/camel-config.xml
    camel/trunk/tests/camel-itest-osgi/src/test/resources/report_incident.wsdl

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java?rev=1155277&r1=1155276&r2=1155277&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
Tue Aug  9 09:21:28 2011
@@ -42,7 +42,7 @@ import static org.ops4j.pax.swissbox.tin
 import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
 
 @RunWith(JUnit4TestRunner.class)
-@Ignore("This test will be failed with CXF 2.4.1, we need to use CXF 2.4.2")
+//@Ignore("This test will be failed with CXF 2.4.1, we need to use CXF 2.4.2")
 public class CxfBlueprintRouterTest extends OSGiBlueprintTestSupport {
     private static Server server;
 
@@ -108,6 +108,7 @@ public class CxfBlueprintRouterTest exte
 
                 bundle(newBundle()
                         .add("OSGI-INF/blueprint/test.xml", CxfBlueprintRouterTest.class.getResource("CxfBlueprintRouter.xml"))
+                        .add("WSDL/report_incident.wsdl", CxfBlueprintRouterTest.class.getResource("/report_incident.wsdl"))
                         .add(org.apache.camel.example.reportincident.InputReportIncident.class)
                         .add(org.apache.camel.example.reportincident.OutputReportIncident.class)
                         .add(org.apache.camel.example.reportincident.ReportIncidentEndpoint.class)

Modified: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml?rev=1155277&r1=1155276&r2=1155277&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml
Tue Aug  9 09:21:28 2011
@@ -25,8 +25,6 @@
 
   <bean id="customerService" class="org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService"
/>
 
-  <!--bean id="cxfbean" class="org.apache.camel.component.cxf.cxfbean.CxfBeanComponent"
/-->
-
   <!-- The camel route context -->
   <camel:camelContext>
     <camel:route>

Modified: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouter.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouter.xml?rev=1155277&r1=1155276&r2=1155277&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouter.xml
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouter.xml
Tue Aug  9 09:21:28 2011
@@ -32,6 +32,10 @@
                         serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"/>
   <camelcxf:cxfEndpoint id="serviceEndpoint"
                         address="http://localhost:9002/cxf"
+                        wsdlURL="WSDL/report_incident.wsdl"
+                        endpointName="s:ReportIncidentPort"
+                        serviceName="s:ReportIncidentEndpointService"
+                        xmlns:s="http://reportincident.example.camel.apache.org"
                         serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"/>
 
   <camelContext id="camel" xmlns="http://camel.apache.org/schema/blueprint">

Modified: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/camel-config.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/camel-config.xml?rev=1155277&r1=1155276&r2=1155277&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/camel-config.xml
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/camel-config.xml
Tue Aug  9 09:21:28 2011
@@ -43,6 +43,10 @@
     <!-- this is the CXF webservice we use as front end -->
     <cxf:cxfEndpoint id="reportIncident"
                      address="http://localhost:9080/camel-itest-osgi/webservices/incident"
+                     wsdlURL="report_incident.wsdl"
+                     endpointName="s:ReportIncidentPort"
+                     serviceName="s:ReportIncidentEndpointService"
+                     xmlns:s="http://reportincident.example.camel.apache.org"
                      serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"/>
 
     <!-- this is the camel route which proxy the web service and forward it to the real
web service -->

Modified: camel/trunk/tests/camel-itest-osgi/src/test/resources/report_incident.wsdl
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/report_incident.wsdl?rev=1155277&r1=1155276&r2=1155277&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/resources/report_incident.wsdl (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/resources/report_incident.wsdl Tue Aug  9
09:21:28 2011
@@ -84,7 +84,7 @@
 
     <!-- Service definition -->
     <wsdl:service name="ReportIncidentEndpointService">
-        <wsdl:port name="ReportIncidentService" binding="tns:ReportIncidentBinding">
+        <wsdl:port name="ReportIncidentPort" binding="tns:ReportIncidentBinding">
             <soap:address location="http://localhost:9080/camel-itest-osgi/webservices/incident"/>
         </wsdl:port>
     </wsdl:service>



Mime
View raw message