Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

SWITCHYARD-1221 drop camel rest binding quickstart

  • Loading branch information...
commit 808f6c75e4931b42d577a82f239809dea7c6b24a 1 parent 78e690f
kcbabo authored December 20, 2012
1  jboss-as7/modules/assembly.xml
@@ -68,7 +68,6 @@
68 68
       <componentDescriptor>src/main/resources/external/antlr/antlr-runtime/assembly-component.xml</componentDescriptor>
69 69
       <componentDescriptor>src/main/resources/external/apache/commons/collections/assembly-component.xml</componentDescriptor>
70 70
       <componentDescriptor>src/main/resources/external/apache/commons/net/assembly-component.xml</componentDescriptor>
71  
-      <componentDescriptor>src/main/resources/external/apache/cxf/jaxrs/assembly-component.xml</componentDescriptor>
72 71
       <componentDescriptor>src/main/resources/external/apache/deltaspike/core-api/assembly-component.xml</componentDescriptor>
73 72
       <componentDescriptor>src/main/resources/external/apache/mina/mina-core/assembly-component.xml</componentDescriptor>
74 73
       <componentDescriptor>src/main/resources/external/batik/assembly-component.xml</componentDescriptor>
4  jboss-as7/modules/pom.xml
@@ -600,10 +600,6 @@
600 600
             <artifactId>camel-cxf</artifactId>
601 601
         </dependency>
602 602
         <dependency>
603  
-            <groupId>org.apache.cxf</groupId>
604  
-            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
605  
-        </dependency>
606  
-        <dependency>
607 603
             <groupId>org.quartz-scheduler</groupId>
608 604
             <artifactId>quartz</artifactId>
609 605
         </dependency>
43  jboss-as7/modules/src/main/resources/external/apache/cxf/jaxrs/assembly-component.xml
... ...
@@ -1,43 +0,0 @@
1  
-<?xml version="1.0" encoding="UTF-8"?>
2  
-<!--
3  
-  ~ JBoss, Home of Professional Open Source.
4  
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
5  
-  ~ as indicated by the @author tags. See the copyright.txt file in the
6  
-  ~ distribution for a full listing of individual contributors.
7  
-  ~
8  
-  ~ This is free software; you can redistribute it and/or modify it
9  
-  ~ under the terms of the GNU Lesser General Public License as
10  
-  ~ published by the Free Software Foundation; either version 2.1 of
11  
-  ~ the License, or (at your option) any later version.
12  
-  ~
13  
-  ~ This software is distributed in the hope that it will be useful,
14  
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
15  
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16  
-  ~ Lesser General Public License for more details.
17  
-  ~
18  
-  ~ You should have received a copy of the GNU Lesser General Public
19  
-  ~ License along with this software; if not, write to the Free
20  
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
21  
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
22  
-  -->
23  
-<component xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd"
24  
-    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
25  
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
26  
-  <files>
27  
-    <file>
28  
-      <source>src/main/resources/external/apache/cxf/jaxrs/module.xml</source>
29  
-      <outputDirectory>/modules/org/apache/cxf/jaxrs/main</outputDirectory>
30  
-      <filtered>true</filtered>
31  
-    </file>
32  
-  </files>
33  
-  <dependencySets>
34  
-    <dependencySet>
35  
-      <outputDirectory>/modules/org/apache/cxf/jaxrs/main</outputDirectory>
36  
-      <includes>
37  
-        <include>org.apache.cxf:cxf-rt-frontend-jaxrs</include>
38  
-      </includes>
39  
-      <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
40  
-      <useTransitiveDependencies>false</useTransitiveDependencies>
41  
-    </dependencySet>
42  
-  </dependencySets>
43  
-</component>
37  jboss-as7/modules/src/main/resources/external/apache/cxf/jaxrs/module.xml
... ...
@@ -1,37 +0,0 @@
1  
-<?xml version="1.0" encoding="UTF-8"?>
2  
-<!--
3  
-  ~ JBoss, Home of Professional Open Source.
4  
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
5  
-  ~ as indicated by the @author tags. See the copyright.txt file in the
6  
-  ~ distribution for a full listing of individual contributors.
7  
-  ~
8  
-  ~ This is free software; you can redistribute it and/or modify it
9  
-  ~ under the terms of the GNU Lesser General Public License as
10  
-  ~ published by the Free Software Foundation; either version 2.1 of
11  
-  ~ the License, or (at your option) any later version.
12  
-  ~
13  
-  ~ This software is distributed in the hope that it will be useful,
14  
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
15  
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16  
-  ~ Lesser General Public License for more details.
17  
-  ~
18  
-  ~ You should have received a copy of the GNU Lesser General Public
19  
-  ~ License along with this software; if not, write to the Free
20  
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
21  
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
22  
-  -->
23  
-<module xmlns="urn:jboss:module:1.0" name="org.apache.cxf.jaxrs">
24  
-
25  
-    <resources>
26  
-        <resource-root path="cxf-rt-frontend-jaxrs-${version.cxf}.jar"/>
27  
-    </resources>
28  
-
29  
-    <dependencies>
30  
-        <module name="javax.api"/>
31  
-        <module name="javax.servlet.api"/>
32  
-        <module name="javax.annotation.api"/>
33  
-        <module name="javax.ws.rs.api"/>
34  
-        <module name="javax.xml.bind.api"/>
35  
-        <module name="org.apache.cxf"/>
36  
-    </dependencies>
37  
-</module>
1  jboss-as7/modules/src/main/resources/external/camel/cxf/module.xml
@@ -33,7 +33,6 @@
33 33
         <module name="org.apache.camel.core"/>
34 34
         <module name="org.apache.camel.spring"/>
35 35
         <module name="org.apache.cxf"/>
36  
-        <module name="org.apache.cxf.jaxrs"/>
37 36
         <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true">
38 37
           <imports>
39 38
             <include path="META-INF/cxf"/>
5  jboss-as7/pom.xml
@@ -162,11 +162,6 @@
162 162
         </dependency>
163 163
         <dependency>
164 164
             <groupId>org.switchyard.quickstarts</groupId>
165  
-            <artifactId>switchyard-quickstart-camel-rest-binding</artifactId>
166  
-            <scope>test</scope>
167  
-        </dependency>
168  
-        <dependency>
169  
-            <groupId>org.switchyard.quickstarts</groupId>
170 165
             <artifactId>switchyard-quickstart-camel-soap-proxy</artifactId>
171 166
             <scope>test</scope>
172 167
         </dependency>
124  jboss-as7/tests/src/test/java/org/switchyard/test/quickstarts/CamelCxfRsBindingQuickstartTest.java
... ...
@@ -1,124 +0,0 @@
1  
-/*
2  
- * JBoss, Home of Professional Open Source
3  
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
4  
- * as indicated by the @authors tag. All rights reserved.
5  
- * See the copyright.txt in the distribution for a
6  
- * full listing of individual contributors.
7  
- *
8  
- * This copyrighted material is made available to anyone wishing to use,
9  
- * modify, copy, or redistribute it subject to the terms and conditions
10  
- * of the GNU Lesser General Public License, v. 2.1.
11  
- * This program is distributed in the hope that it will be useful, but WITHOUT A
12  
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13  
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
14  
- * You should have received a copy of the GNU Lesser General Public License,
15  
- * v.2.1 along with this distribution; if not, write to the Free Software
16  
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
17  
- * MA  02110-1301, USA.
18  
- */
19  
-package org.switchyard.test.quickstarts;
20  
-
21  
-import java.io.IOException;
22  
-
23  
-import org.jboss.arquillian.container.test.api.Deployment;
24  
-import org.jboss.arquillian.junit.Arquillian;
25  
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
26  
-import org.junit.Assert;
27  
-import org.junit.Ignore;
28  
-import org.junit.Test;
29  
-import org.junit.runner.RunWith;
30  
-import org.switchyard.test.ArquillianUtil;
31  
-import org.switchyard.test.SwitchYardTestKit;
32  
-import org.switchyard.component.test.mixins.http.HTTPMixIn;
33  
-
34  
-/**
35  
- * Tests for Camel CXFRS binding.
36  
- *
37  
- * @author Magesh Kumar B <mageshbk@jboss.com> (C) 2012 Red Hat Inc.
38  
- */
39  
-@Ignore("This test fails due dependency to CXF 2.6.1 absent in AS 7.1")
40  
-@RunWith(Arquillian.class)
41  
-public class CamelCxfRsBindingQuickstartTest {
42  
-
43  
-    @Deployment(testable = false)
44  
-    public static JavaArchive createDeployment() throws IOException {
45  
-        return ArquillianUtil.createJarQSDeployment("switchyard-quickstart-camel-rest-binding");
46  
-    }
47  
-
48  
-    @Test
49  
-    public void camelRestBinding() throws IOException {
50  
-        HTTPMixIn http = new HTTPMixIn();
51  
-        http.initialize();
52  
-
53  
-        // Create our inventory
54  
-        String response = http.sendString(BASE_URL + "/order/inventory/create", "", HTTPMixIn.HTTP_OPTIONS);
55  
-        Assert.assertEquals(SUCCESS, response);
56  
-
57  
-        // Create an order
58  
-        response = http.sendString(BASE_URL + "/order", "", HTTPMixIn.HTTP_POST);
59  
-        SwitchYardTestKit.compareXMLToString(response, ORDER);
60  
-
61  
-        // Add items
62  
-        response = http.sendString(BASE_URL + "/order/item", ORDER2, HTTPMixIn.HTTP_PUT);
63  
-        Assert.assertEquals(SUCCESS, response);
64  
-
65  
-        // Look at our order
66  
-        response = http.sendString(BASE_URL + "/order/1", "", HTTPMixIn.HTTP_GET);
67  
-        SwitchYardTestKit.compareXMLToString(response, ORDER3);
68  
-
69  
-        // Delete item
70  
-        response = http.sendString(BASE_URL + "/order/1:4", ORDER2, HTTPMixIn.HTTP_DELETE);
71  
-        Assert.assertEquals(SUCCESS, response);
72  
-    }
73  
-
74  
-    private static final String BASE_URL = "http://localhost:18001";
75  
-    private static final String SUCCESS = "Order service is DUMB!";
76  
-    private static final String ORDER = "<order>"
77  
-                                       + "    <orderId>1</orderId>"
78  
-                                       + "</order>";
79  
-    private static final String ORDER2 = "<order>"
80  
-                                       + "    <orderId>1</orderId>"
81  
-                                       + "    <orderItem>"
82  
-                                       + "        <item>"
83  
-                                       + "            <itemId>1</itemId>"
84  
-                                       + "         </item>"
85  
-                                       + "         <quantity>10</quantity>"
86  
-                                       + "     </orderItem>"
87  
-                                       + "    <orderItem>"
88  
-                                       + "        <item>"
89  
-                                       + "            <itemId>3</itemId>"
90  
-                                       + "        </item>"
91  
-                                       + "        <quantity>5</quantity>"
92  
-                                       + "    </orderItem>"
93  
-                                       + "    <orderItem>"
94  
-                                       + "        <item>"
95  
-                                       + "            <itemId>4</itemId>"
96  
-                                       + "        </item>"
97  
-                                       + "        <quantity>3</quantity>"
98  
-                                       + "    </orderItem>"
99  
-                                       + "</order>";
100  
-    private static final String ORDER3 = "<order>"
101  
-                                       + "    <orderId>1</orderId>"
102  
-                                       + "    <orderItem>"
103  
-                                       + "        <item>"
104  
-                                       + "            <itemId>1</itemId>"
105  
-                                       + "            <name>Hydrogen Atom - No, we are not kidding!</name>"
106  
-                                       + "        </item>"
107  
-                                       + "        <quantity>10</quantity>"
108  
-                                       + "    </orderItem>"
109  
-                                       + "    <orderItem>"
110  
-                                       + "        <item>"
111  
-                                       + "            <itemId>3</itemId>"
112  
-                                       + "            <name>Einstein's Bust - Talks about your future :)</name>"
113  
-                                       + "        </item>"
114  
-                                       + "        <quantity>5</quantity>"
115  
-                                       + "    </orderItem>"
116  
-                                       + "    <orderItem>"
117  
-                                       + "        <item>"
118  
-                                       + "            <itemId>4</itemId>"
119  
-                                       + "            <name>Time Machine</name>"
120  
-                                       + "        </item>"
121  
-                                       + "        <quantity>3</quantity>"
122  
-                                       + "    </orderItem>"
123  
-                                       + "</order>";
124  
-}

0 notes on commit 808f6c7

Please sign in to comment.
Something went wrong with that request. Please try again.