Author: ningjiang
Date: Tue Aug 9 06:54:52 2011
New Revision: 1155228
URL: http://svn.apache.org/viewvc?rev=1155228&view=rev
Log:
Refactor cxf jaxrs testbean of the camel-itest-osgi
Added:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Customer.java
(contents, props changed)
- copied, changed from r1154933,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Customer.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerService.java
(contents, props changed)
- copied, changed from r1154933,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/CustomerService.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerServiceResource.java
(contents, props changed)
- copied, changed from r1154933,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/CustomerServiceResource.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Order.java
(contents, props changed)
- copied, changed from r1154933,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Order.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Product.java
(contents, props changed)
- copied, changed from r1154933,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Product.java
Removed:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Customer.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/CustomerService.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/CustomerServiceResource.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Order.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Product.java
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/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml
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=1155228&r1=1155227&r2=1155228&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 06:54:52 2011
@@ -115,8 +115,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/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java?rev=1155228&r1=1155227&r2=1155228&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
Tue Aug 9 06:54:52 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;
@@ -192,11 +192,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(),
Copied:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Customer.java
(from r1154933,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Customer.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Customer.java?p2=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Customer.java&p1=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Customer.java&r1=1154933&r2=1155228&rev=1155228&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Customer.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Customer.java
Tue Aug 9 06:54:52 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean;
+package org.apache.camel.itest.osgi.cxf.jaxrs.testbean;
import javax.xml.bind.annotation.XmlRootElement;
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Customer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Customer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerService.java
(from r1154933,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/CustomerService.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerService.java?p2=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerService.java&p1=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/CustomerService.java&r1=1154933&r2=1155228&rev=1155228&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/CustomerService.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerService.java
Tue Aug 9 06:54:52 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean;
+package org.apache.camel.itest.osgi.cxf.jaxrs.testbean;
import java.util.ArrayList;
import java.util.HashMap;
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerServiceResource.java
(from r1154933,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/CustomerServiceResource.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerServiceResource.java?p2=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerServiceResource.java&p1=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/CustomerServiceResource.java&r1=1154933&r2=1155228&rev=1155228&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/CustomerServiceResource.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerServiceResource.java
Tue Aug 9 06:54:52 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean;
+package org.apache.camel.itest.osgi.cxf.jaxrs.testbean;
import javax.ws.rs.GET;
import javax.ws.rs.PUT;
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerServiceResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/CustomerServiceResource.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Order.java
(from r1154933,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Order.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Order.java?p2=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Order.java&p1=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Order.java&r1=1154933&r2=1155228&rev=1155228&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Order.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Order.java
Tue Aug 9 06:54:52 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean;
+package org.apache.camel.itest.osgi.cxf.jaxrs.testbean;
import java.util.HashMap;
import java.util.Map;
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Order.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Order.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Product.java
(from r1154933,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Product.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Product.java?p2=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Product.java&p1=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Product.java&r1=1154933&r2=1155228&rev=1155228&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/jaxrs/testbean/Product.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Product.java
Tue Aug 9 06:54:52 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean;
+package org.apache.camel.itest.osgi.cxf.jaxrs.testbean;
import javax.xml.bind.annotation.XmlRootElement;
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Product.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/jaxrs/testbean/Product.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml?rev=1155228&r1=1155227&r2=1155228&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml
Tue Aug 9 06:54:52 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>
