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 2008/06/20 04:35:10 UTC

svn commit: r669768 - in /geronimo/server/branches/2.1/testsuite/commands-testsuite: deploy/ gshell/ jaxws/ jaxws/src/ jaxws/src/test/ jaxws/src/test/java/ jaxws/src/test/java/org/ jaxws/src/test/java/org/apache/ jaxws/src/test/java/org/apache/geronimo...

Author: gawor
Date: Thu Jun 19 19:35:09 2008
New Revision: 669768

URL: http://svn.apache.org/viewvc?rev=669768&view=rev
Log:
clean up commands-testsuite a bit and add jaxws-tools tests

Added:
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/LICENSE.txt   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/NOTICE.txt   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/Greeter.java   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/resources/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/resources/testng.xml   (with props)
Removed:
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/goals.txt
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/goals.txt
Modified:
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml

Modified: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml?rev=669768&r1=669767&r2=669768&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml Thu Jun 19 19:35:09 2008
@@ -43,7 +43,6 @@
             <id>child</id>
             <build>
                 <plugins>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
@@ -53,11 +52,6 @@
                             </suiteXmlFiles>
                         </configuration>
                     </plugin>
-                    
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>selenium-maven-plugin</artifactId>
-                    </plugin>
                 </plugins>
             </build>
         </profile>

Modified: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml?rev=669768&r1=669767&r2=669768&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml Thu Jun 19 19:35:09 2008
@@ -52,11 +52,6 @@
                             </suiteXmlFiles>
                         </configuration>
                     </plugin>
-                    
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>selenium-maven-plugin</artifactId>
-                    </plugin>
                 </plugins>
             </build>
         </profile>

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/LICENSE.txt?rev=669768&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/LICENSE.txt (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/LICENSE.txt Thu Jun 19 19:35:09 2008
@@ -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/branches/2.1/testsuite/commands-testsuite/jaxws/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/NOTICE.txt?rev=669768&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/NOTICE.txt (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/NOTICE.txt Thu Jun 19 19:35:09 2008
@@ -0,0 +1,5 @@
+Apache Geronimo
+Copyright 2003-2008 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml?rev=669768&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml Thu Jun 19 19:35:09 2008
@@ -0,0 +1,84 @@
+<?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.
+-->
+<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>commands-testsuite</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jaxws-testsuite</artifactId>
+    <name>Geronimo TestSuite :: Commands Testsuite :: JAXWS Tools</name>
+
+    <description>
+        Test for jaxws-toos.bat/sh
+    </description>
+
+    <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>
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                            <systemProperties>
+                               <property>
+                                   <name>project.build.directory</name>
+                                   <value>${project.build.directory}</value>
+                               </property>
+                               <property>
+                                   <name>project.directory</name>
+                                   <value>${basedir}</value>
+                               </property>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
+</project>

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/Greeter.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/Greeter.java?rev=669768&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/Greeter.java (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/Greeter.java Thu Jun 19 19:35:09 2008
@@ -0,0 +1,72 @@
+/**
+ * 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.jaxws;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+
+@WebService(name = "Greeter", targetNamespace = "http://apache.org/greeter_control")
+public class Greeter {
+
+
+    @WebMethod
+    @WebResult(name = "responseType", targetNamespace = "http://apache.org/greeter_control/types")
+    @RequestWrapper(localName = "sayHi", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.SayHi")
+    @ResponseWrapper(localName = "sayHiResponse", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.SayHiResponse")
+    public String sayHi() {
+        return "hi";
+    }
+
+    /**
+     * 
+     * @param requestType
+     * @return
+     *     returns java.lang.String
+     */
+    @WebMethod
+    @WebResult(name = "responseType", targetNamespace = "http://apache.org/greeter_control/types")
+    @RequestWrapper(localName = "greetMe", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMe")
+    @ResponseWrapper(localName = "greetMeResponse", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMeResponse")
+    public String greetMe(
+        @WebParam(name = "requestType", targetNamespace = "http://apache.org/greeter_control/types")
+        String requestType) {
+        return requestType;
+    }
+
+    /**
+     * 
+     * @param requestType
+     */
+    @WebMethod
+    @Oneway
+    @RequestWrapper(localName = "greetMeOneWay", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMeOneWay")
+    public void greetMeOneWay(
+        @WebParam(name = "requestType", targetNamespace = "http://apache.org/greeter_control/types")
+        String requestType) {
+        
+    }
+
+}

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/Greeter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java?rev=669768&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java Thu Jun 19 19:35:09 2008
@@ -0,0 +1,108 @@
+/**
+ *  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.jaxws;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.geronimo.testsupport.commands.CommandTestSupport;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+@Test
+public class JAXWSToolsTest extends CommandTestSupport {
+
+    protected String executeWsGen(String[] args) throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        List<String> cmd = new ArrayList<String>();
+        cmd.addAll(Arrays.asList("wsgen"));
+        if (args != null) {
+            cmd.addAll(Arrays.asList(args));
+        }
+        execute("jaxws-tools", cmd, null, baos);
+        return baos.toString();
+    }
+    
+    protected String executeWsImport(String[] args) throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        List<String> cmd = new ArrayList<String>();
+        cmd.addAll(Arrays.asList("wsimport"));
+        if (args != null) {
+            cmd.addAll(Arrays.asList(args));
+        }
+        execute("jaxws-tools", cmd, null, baos);
+        return baos.toString();
+    }
+        
+    @Test
+    public void testWsGen() throws Exception {
+        String projectDir = System.getProperty("project.directory");
+        String targetDir = System.getProperty("project.build.directory");
+        
+        File outputDir = createUniqueDirectory(targetDir, "wsgen-");
+        File testClassesDir = new File(projectDir, "target/test-classes");
+        
+        String[] args = new String[]{ "-verbose", "-keep", "-d", outputDir.getAbsolutePath(), "-cp", testClassesDir.getAbsolutePath(), "org.apache.geronimo.testsuite.jaxws.Greeter" };
+ 
+        String output = executeWsGen(args);
+     
+        checkGeneratedFiles(outputDir, output);
+    }
+    
+    @Test
+    public void testWsImport() throws Exception {
+        String projectDir = System.getProperty("project.directory");
+        String targetDir = System.getProperty("project.build.directory");
+        
+        File outputDir = createUniqueDirectory(targetDir, "wsimport-");        
+        File wsdlFile = new File(projectDir, "src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl");
+        
+        String[] args = new String[]{ "-verbose", "-keep", "-d", outputDir.getAbsolutePath(), wsdlFile.getAbsolutePath() };
+        
+        String output = executeWsImport(args);
+
+        checkGeneratedFiles(outputDir, output);
+    }
+
+    private void checkGeneratedFiles(File outputDir, String output) {
+        String packageName = "org.apache.greeter_control.types.";
+        packageName = packageName.replace('.', File.separatorChar);
+        List<String> expectedFiles = Arrays.asList("GreetMe.java",  "GreetMeOneWay.java", "GreetMeResponse.java", "SayHi.java", "SayHiResponse.java");
+                                      
+        for (String file : expectedFiles) {
+            file = packageName + file;
+            Assert.assertTrue(output.indexOf(file) > 0, "Expected " + file + " in " + output);
+            File sourceFile = new File(outputDir, file);
+            Assert.assertTrue(sourceFile.exists(), "Source file " + file + " does not exist");
+        }
+    }
+    
+    private File createUniqueDirectory(String targetDir, String prefix) {
+        File dir = new File(targetDir, prefix + System.currentTimeMillis());
+        if (!dir.mkdir()) {
+            throw new RuntimeException("Failed to create unqiue directory " + dir);
+        }
+        return dir;
+    }
+               
+}

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl?rev=669768&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl Thu Jun 19 19:35:09 2008
@@ -0,0 +1,183 @@
+<?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.
+-->
+<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:tns="http://apache.org/greeter_control"
+    xmlns:x1="http://apache.org/greeter_control/types"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://apache.org/greeter_control" name="HelloWorld">
+    <wsdl:types>
+        <schema targetNamespace="http://apache.org/greeter_control/types" 
+            xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+
+            <element name="sayHi">
+                <complexType/>
+            </element>
+            <element name="sayHiResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMe">
+                <complexType>
+                    <sequence>
+                        <element name="requestType" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMeResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMeOneWay">
+                <complexType>
+                    <sequence>
+                        <element name="requestType" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="pingMe">
+                <complexType/>
+            </element>
+            <element name="pingMeResponse">
+                <complexType/>
+            </element>
+            <element name="faultDetail">
+                <complexType>
+                    <sequence>
+                        <element name="minor" type="xsd:short"/>
+                        <element name="major" type="xsd:short"/>
+                    </sequence>
+                </complexType>
+            </element>
+            
+        </schema>
+    </wsdl:types>
+
+   
+   <wsdl:message name="sayHiRequest">
+        <wsdl:part element="x1:sayHi" name="in"/>
+    </wsdl:message>
+    <wsdl:message name="sayHiResponse">
+        <wsdl:part element="x1:sayHiResponse" name="out"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeRequest">
+        <wsdl:part element="x1:greetMe" name="in"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeResponse">
+        <wsdl:part element="x1:greetMeResponse" name="out"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeOneWayRequest">
+        <wsdl:part element="x1:greetMeOneWay" name="in"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeRequest">
+    <wsdl:part name="in" element="x1:pingMe"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeResponse">
+        <wsdl:part name="out" element="x1:pingMeResponse"/>
+    </wsdl:message>        
+    <wsdl:message name="pingMeFault">
+        <wsdl:part name="faultDetail" element="x1:faultDetail"/>
+    </wsdl:message> 
+        
+    <wsdl:portType name="Greeter">
+        <wsdl:operation name="sayHi">
+            <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
+            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
+        </wsdl:operation>
+        
+        <wsdl:operation name="greetMe">
+            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+        </wsdl:operation>
+        
+        <wsdl:operation name="greetMeOneWay">
+            <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
+        </wsdl:operation>
+
+        <wsdl:operation name="pingMe">
+            <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
+            <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
+            <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
+        </wsdl:operation> 
+    </wsdl:portType>
+    
+
+    <wsdl:binding name="GreeterSOAPBinding" type="tns:Greeter">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        
+        <wsdl:operation name="sayHi">
+            <soap:operation soapAction="" style="document"/>
+            <wsdl:input name="sayHiRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="sayHiResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        
+        <wsdl:operation name="greetMe">
+            <soap:operation soapAction="" style="document"/>
+            <wsdl:input name="greetMeRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="greetMeResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        
+        <wsdl:operation name="greetMeOneWay">
+            <soap:operation soapAction="" style="document"/>
+            <wsdl:input name="greetMeOneWayRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+        </wsdl:operation>
+
+            <wsdl:operation name="pingMe">
+            <soap:operation style="document"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+            <wsdl:fault name="pingMeFault">
+                <soap:fault name="pingMeFault" use="literal"/>
+            </wsdl:fault>
+        </wsdl:operation>
+        
+    </wsdl:binding>
+  
+    <wsdl:service name="GreeterService">
+        <wsdl:port binding="tns:GreeterSOAPBinding" name="GreeterPort">
+            <soap:address location="http://localhost:8080/SoapContext/GreeterPort"/>
+            <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/08/addressing/wsdl"/>
+        </wsdl:port>
+    </wsdl:service>
+   
+    
+</wsdl:definitions>
+

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/resources/testng.xml?rev=669768&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/resources/testng.xml (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/resources/testng.xml Thu Jun 19 19:35:09 2008
@@ -0,0 +1,32 @@
+<?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.
+-->
+
+<!-- $Rev: 514087 $ $Date: 2007-03-03 14:13:40 +0800 (Sat, 03 Mar 2007) $ -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="Suite1" verbose="1">
+    <test name="commands-testsuite.jaxws">
+        <packages>
+            <package name="org.apache.geronimo.testsuite.jaxws"/>
+        </packages>
+    </test>
+</suite>
+

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native