You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/10/02 04:07:31 UTC
svn commit: r581126 - in
/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests: ./
jaxws-rest-war/ jaxws-rest-war/src/ jaxws-rest-war/src/main/
jaxws-rest-war/src/main/java/ jaxws-rest-war/src/main/java/org/
jaxws-rest-war/src/main/java/or...
Author: gawor
Date: Mon Oct 1 19:07:29 2007
New Revision: 581126
URL: http://svn.apache.org/viewvc?rev=581126&view=rev
Log:
tests for RESTful jaxws web service
Added:
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/LICENSE.txt (with props)
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/NOTICE.txt (with props)
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml (with props)
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/org/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/org/apache/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/org/apache/calculator/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/org/apache/calculator/CalculatorImpl.java (with props)
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/geronimo-web.xml (with props)
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/web.xml (with props)
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/geronimo/testsuite/testset/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSRestTest.java (with props)
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/resources/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/resources/request1.xml (with props)
Modified:
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml
Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/LICENSE.txt?rev=581126&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/LICENSE.txt (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/LICENSE.txt Mon Oct 1 19:07:29 2007
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/NOTICE.txt?rev=581126&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/NOTICE.txt (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/NOTICE.txt Mon Oct 1 19:07:29 2007
@@ -0,0 +1,5 @@
+Apache Geronimo
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml?rev=581126&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml Mon Oct 1 19:07:29 2007
@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>jaxws-tests</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>jaxws-rest-war</artifactId>
+ <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS REST WAR</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>testsuite-maven-plugin</artifactId>
+ <version>${version}</version>
+ <executions>
+ <execution>
+ <id>generate-surefire-xml</id>
+ <phase>install</phase>
+ <goals>
+ <goal>generate-surefire-xml</goal>
+ </goals>
+ <!--
+ Merging the configuration of this plugin with the one it inherits.
+ Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+ -->
+ <configuration>
+ <grandParent>true</grandParent>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>${artifactId}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>JEE5/JAXWSRESTServlet/1.1/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/org/apache/calculator/CalculatorImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/org/apache/calculator/CalculatorImpl.java?rev=581126&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/org/apache/calculator/CalculatorImpl.java (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/org/apache/calculator/CalculatorImpl.java Mon Oct 1 19:07:29 2007
@@ -0,0 +1,110 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.calculator;
+
+import java.io.ByteArrayInputStream;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletRequest;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.BindingType;
+import javax.xml.ws.Provider;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceProvider;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.http.HTTPBinding;
+import javax.xml.ws.http.HTTPException;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+
+@WebServiceProvider
+@BindingType(value=HTTPBinding.HTTP_BINDING)
+public class CalculatorImpl implements Provider<Source> {
+
+ @Resource
+ protected WebServiceContext wsContext;
+
+ public Source invoke(Source source) {
+ try {
+ String num1 = null;
+ String num2 = null;
+
+ if (source == null) {
+ System.out.println("Getting input from query string");
+ MessageContext mc = wsContext.getMessageContext();
+ String query = (String)mc.get(MessageContext.QUERY_STRING);
+ System.out.println("Query String = " + query);
+ ServletRequest req = (ServletRequest)mc.get(MessageContext.SERVLET_REQUEST);
+ num1 = req.getParameter("num1");
+ num2 = req.getParameter("num2");
+ } else {
+ System.out.println("Getting input from input message");
+ Node n = null;
+ if (source instanceof DOMSource) {
+ n = ((DOMSource)source).getNode();
+ } else if (source instanceof StreamSource) {
+ StreamSource streamSource = (StreamSource)source;
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ InputSource inputSource = null;
+ if (streamSource.getInputStream() != null) {
+ inputSource = new InputSource(streamSource.getInputStream());
+ } else if (streamSource.getReader() != null) {
+ inputSource = new InputSource(streamSource.getReader());
+ }
+ n = db.parse(inputSource);
+ } else {
+ throw new RuntimeException("Unsupported source: " + source);
+ }
+ NodeList children = n.getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child.getNodeName().equals("add")) {
+ num1 = child.getAttributes().getNamedItem("num1").getNodeValue();
+ num2 = child.getAttributes().getNamedItem("num2").getNodeValue();
+ break;
+ }
+ }
+ }
+
+ int n1 = Integer.parseInt(num1);
+ int n2 = Integer.parseInt(num2);
+ return createResultSource(n1 + n2);
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new HTTPException(500);
+ }
+ }
+
+ private Source createResultSource(int sum) {
+ String body =
+ "<ns:addResponse xmlns:ns=\"http://geronimo.apache.org\"><ns:return>"
+ + sum
+ + "</ns:return></ns:addResponse>";
+ Source source = new StreamSource(new ByteArrayInputStream(body.getBytes()));
+ return source;
+ }
+}
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/org/apache/calculator/CalculatorImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=581126&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/geronimo-web.xml Mon Oct 1 19:07:29 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
+ <dep:environment>
+ <dep:moduleId>
+ <dep:groupId>JEE5</dep:groupId>
+ <dep:artifactId>JAXWSRESTServlet</dep:artifactId>
+ <dep:version>1.1</dep:version>
+ <dep:type>car</dep:type>
+ </dep:moduleId>
+ </dep:environment>
+
+ <context-root>/jaxws-rest-war</context-root>
+
+</web-app>
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/web.xml?rev=581126&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/web.xml Mon Oct 1 19:07:29 2007
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
+ <servlet>
+ <servlet-name>CalculatorServlet</servlet-name>
+ <servlet-class>org.apache.calculator.CalculatorImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>CalculatorServlet</servlet-name>
+ <url-pattern>/calculator</url-pattern>
+ </servlet-mapping>
+</web-app>
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSRestTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSRestTest.java?rev=581126&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSRestTest.java (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSRestTest.java Mon Oct 1 19:07:29 2007
@@ -0,0 +1,181 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.testsuite.testset;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.StringReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.geronimo.testsupport.TestSupport;
+import org.testng.annotations.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+import org.xml.sax.InputSource;
+
+public class JaxWSRestTest extends TestSupport {
+
+ private String baseURL = "http://localhost:8080/";
+
+ @Test
+ public void testGET() throws Exception {
+ String warName = System.getProperty("webAppName");
+ assertNotNull("Web application name not specified", warName);
+
+ URL url = new URL(baseURL + warName + "/calculator?num1=10&num2=50");
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ try {
+ String reply = call(conn);
+
+ assertEquals("responseCode", 200, conn.getResponseCode());
+
+ InputSource is = new InputSource(new StringReader(reply));
+ Document doc = parseMessage(is);
+
+ Text replyMsg = findText(doc.getDocumentElement(), "60");
+ assertTrue("reply message", replyMsg != null);
+
+ } finally {
+ conn.disconnect();
+ }
+ }
+
+ @Test
+ public void testPOST() throws Exception {
+ String warName = System.getProperty("webAppName");
+ assertNotNull("Web application name not specified", warName);
+
+ InputStream requestInput = JaxWSRestTest.class.getResourceAsStream("/request1.xml");
+ assertNotNull("SOAP request not specified", requestInput);
+
+ URL url = new URL(baseURL + warName + "/calculator");
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ try {
+ String reply = call(requestInput, conn);
+
+ assertEquals("responseCode", 200, conn.getResponseCode());
+
+ InputSource is = new InputSource(new StringReader(reply));
+ Document doc = parseMessage(is);
+
+ Text replyMsg = findText(doc.getDocumentElement(), "120");
+ assertTrue("reply message", replyMsg != null);
+
+ } finally {
+ conn.disconnect();
+ }
+ }
+
+
+ private Document parseMessage(InputSource is) throws Exception {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ DocumentBuilder db = dbf.newDocumentBuilder();
+
+ Document doc = db.parse(is);
+ return doc;
+ }
+
+ private Text findText(Element element, String value) {
+ NodeList list = element.getChildNodes();
+ for (int i = 0; i < list.getLength(); i++) {
+ Node child = (Node)list.item(i);
+ if (child instanceof Text) {
+ Text text = (Text)child;
+ if (text.getData().indexOf(value) != -1) {
+ return text;
+ }
+ } else if (child instanceof Element) {
+ Element childEl = (Element)child;
+ Text text = findText(childEl, value);
+ if (text != null) {
+ return text;
+ }
+ }
+ }
+ return null;
+ }
+
+ private String call(HttpURLConnection conn) throws IOException {
+ return call(null, conn);
+ }
+
+ private String call(InputStream requestInput, HttpURLConnection conn) throws IOException {
+ conn.setConnectTimeout(30 * 1000);
+ conn.setReadTimeout(30 * 1000);
+ conn.setDoInput(true);
+ conn.setUseCaches(false);
+
+ if (requestInput == null) {
+ conn.setRequestMethod("GET");
+ conn.setRequestProperty("Content-Type", "application/xml");
+
+ conn.connect();
+ } else {
+ conn.setRequestMethod("POST");
+ conn.setDoOutput(true);
+ conn.setRequestProperty("Content-Type", "application/xml");
+
+ conn.connect();
+
+ OutputStream out = conn.getOutputStream();
+
+ byte[] data = new byte[1024];
+ int read = 0;
+ while ((read = requestInput.read(data, 0, data.length)) != -1) {
+ out.write(data, 0, read);
+ }
+
+ requestInput.close();
+
+ out.flush();
+ out.close();
+ }
+
+ InputStream is = null;
+
+ try {
+ is = conn.getInputStream();
+ } catch (IOException e) {
+ is = conn.getErrorStream();
+ }
+
+ StringBuffer buf = new StringBuffer();
+ BufferedReader in = new BufferedReader(new InputStreamReader(is));
+ String inputLine;
+ while ((inputLine = in.readLine()) != null) {
+ System.out.println(inputLine);
+ buf.append(inputLine);
+ }
+ in.close();
+
+ return buf.toString();
+ }
+
+}
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSRestTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/resources/request1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/resources/request1.xml?rev=581126&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/resources/request1.xml (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/resources/request1.xml Mon Oct 1 19:07:29 2007
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<add num1="100" num2="20"/>
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/resources/request1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml?rev=581126&r1=581125&r2=581126&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml Mon Oct 1 19:07:29 2007
@@ -38,6 +38,7 @@
<module>jaxws-war</module>
<module>jaxws-client</module>
<module>jaxws-ejb</module>
+ <module>jaxws-rest-war</module>
</modules>
</profile>
</profiles>