You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/19 22:11:46 UTC
svn commit: r1172790 - in /camel/branches/camel-2.8.x: ./
tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/
tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/
tests/camel-itest-o...
Author: dkulp
Date: Mon Sep 19 20:11:46 2011
New Revision: 1172790
URL: http://svn.apache.org/viewvc?rev=1172790&view=rev
Log:
Merged revisions 1155228 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1155228 | ningjiang | 2011-08-09 02:54:52 -0400 (Tue, 09 Aug 2011) | 1 line
Refactor cxf jaxrs testbean of the camel-itest-osgi
........
Added:
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/
- copied from r1155228, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/
- copied from r1155228, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Customer.java
- copied unchanged from r1155228, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Customer.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerService.java
- copied unchanged from r1155228, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerService.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerServiceResource.java
- copied unchanged from r1155228, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerServiceResource.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Order.java
- copied unchanged from r1155228, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Order.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Product.java
- copied unchanged from r1155228, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Product.java
Removed:
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Customer.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/CustomerService.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/CustomerServiceResource.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Order.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Product.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java?rev=1172790&r1=1172789&r2=1172790&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java (original)
+++ camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java Mon Sep 19 20:11:46 2011
@@ -114,8 +114,7 @@ public class CxfBlueprintRouterTest exte
.add(org.apache.camel.example.reportincident.ObjectFactory.class)
.set(Constants.BUNDLE_SYMBOLICNAME, "CxfBlueprintRouterTest")
.set(Constants.DYNAMICIMPORT_PACKAGE, "*")
- .build(withBnd())).noStart(),
- vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006")
+ .build(withBnd())).noStart()
);
Modified: camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java?rev=1172790&r1=1172789&r2=1172790&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java (original)
+++ camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java Mon Sep 19 20:11:46 2011
@@ -19,7 +19,7 @@ package org.apache.camel.itest.osgi.cxf.
import org.apache.camel.CamelContext;
import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
-import org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean.CustomerService;
+import org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.http.HttpResponse;
@@ -190,11 +190,11 @@ public class CxfRsBlueprintRouterTest ex
bundle(newBundle()
.add("OSGI-INF/blueprint/test.xml", CxfRsBlueprintRouterTest.class.getResource("CxfRsBlueprintRouter.xml"))
- .add(org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean.Customer.class)
- .add(org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean.CustomerService.class)
- .add(org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean.CustomerServiceResource.class)
- .add(org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean.Order.class)
- .add(org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean.Product.class)
+ .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Customer.class)
+ .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService.class)
+ .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerServiceResource.class)
+ .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Order.class)
+ .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Product.class)
.set(Constants.BUNDLE_SYMBOLICNAME, "CxfRsBlueprintRouterTest")
.set(Constants.DYNAMICIMPORT_PACKAGE, "*")
.build()).noStart()
Modified: camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml?rev=1172790&r1=1172789&r2=1172790&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml (original)
+++ camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml Mon Sep 19 20:11:46 2011
@@ -21,15 +21,15 @@
xmlns:camel="http://camel.apache.org/schema/blueprint"
xmlns:camelcxf="http://camel.apache.org/schema/blueprint/cxf">
- <bean id="customerService" class="org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean.CustomerService" />
+ <bean id="customerService" class="org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService" />
<!-- Defined the server endpoint to create the cxf-rs consumer -->
<camelcxf:rsServer id="rsServer" address="http://localhost:9000/route"
- serviceClass="org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean.CustomerService" />
+ serviceClass="org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService" />
<!-- Defined the client endpoint to create the cxf-rs consumer -->
<camelcxf:rsClient id="rsClient" address="http://localhost:9002/rest"
- serviceClass="org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean.CustomerService"/>
+ serviceClass="org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService"/>
<!-- The camel route context -->
<camel:camelContext>