cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r539517 [5/9] - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/ api/src/main/java/org/apache/cxf/binding/ api/src/main/java/org/apache/cxf/clustering/ api/src/main/java/org/apache/cxf/endpoint/ api/src/main/java/org/apache/cxf/fe...
Date Fri, 18 May 2007 16:39:48 GMT
Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java Fri May 18 09:39:38 2007
@@ -1,110 +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.cxf.tools.java2wsdl.generator.wsdl11;
-
-import java.io.File;
-import java.io.FileInputStream;
-
-import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.ProcessorTestBase;
-import org.apache.cxf.tools.common.ToolConstants;
-import org.apache.cxf.tools.java2wsdl.processor.JavaToProcessor;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class WrapperBeanGeneratorTest extends ProcessorTestBase {
-    JavaToProcessor processor = new JavaToProcessor();
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-        processor.setEnvironment(env);
-    }
-
-    @After
-    public void tearDown() {
-        super.tearDown();
-    }
-    
-    private ServiceInfo getServiceInfo() {
-        return processor.getServiceBuilder().build();
-    }
-    
-    @Test
-    public void testGenInAnotherPackage() throws Exception {
-        String testingClass = "org.apache.cxf.tools.fortest.withannotation.doc.GreeterNoWrapperBean";
-        env.put(ToolConstants.CFG_CLASSNAME, testingClass);
-        
-        WrapperBeanGenerator generator = new WrapperBeanGenerator();
-        generator.setServiceModel(getServiceInfo());
-        
-        generator.generate(output);
-
-        String pkgBase = "org/apache/cxf";
-        File requestWrapperClass = new File(output, pkgBase + "/EchoDataBean.java");
-        assertTrue(requestWrapperClass.exists());
-        String contents = IOUtils.toString(new FileInputStream(requestWrapperClass));
-        assertTrue(contents.indexOf("org.apache.cxf.tools.fortest.withannotation.doc") != -1);
-        
-        File responseWrapperClass = new File(output, pkgBase + "/EchoDataBeanResponse.java");
-        assertTrue(responseWrapperClass.exists());
-
-        requestWrapperClass = new File(output, pkgBase + "/SayHi.java");
-        assertTrue(requestWrapperClass.exists());
-        responseWrapperClass = new File(output, pkgBase + "/SayHiResponse.java");
-        assertTrue(responseWrapperClass.exists());
-    }
-
-    @Test
-    public void testArray() throws Exception {
-        String testingClass = "org.apache.cxf.tools.fortest.withannotation.doc.GreeterArray";
-        env.put(ToolConstants.CFG_CLASSNAME, testingClass);
-        
-        WrapperBeanGenerator generator = new WrapperBeanGenerator();
-        generator.setServiceModel(getServiceInfo());
-        
-        generator.generate(output);
-
-        String pkgBase = "org/apache/cxf/tools/fortest/withannotation/doc/jaxws";
-        File requestWrapperClass = new File(output, pkgBase + "/SayIntArray.java");
-        assertTrue(requestWrapperClass.exists());
-        String contents = IOUtils.toString(new FileInputStream(requestWrapperClass));
-        assertTrue(contents.indexOf("int[]") != -1);
-        
-        File responseWrapperClass = new File(output, pkgBase + "/SayIntArrayResponse.java");
-        assertTrue(responseWrapperClass.exists());
-        contents = IOUtils.toString(new FileInputStream(responseWrapperClass));
-        assertTrue(contents.indexOf("_return") != -1);
-        
-        requestWrapperClass = new File(output, pkgBase + "/SayStringArray.java");
-        assertTrue(requestWrapperClass.exists());
-        responseWrapperClass = new File(output, pkgBase + "/SayStringArrayResponse.java");
-        assertTrue(responseWrapperClass.exists());
-
-        requestWrapperClass = new File(output, pkgBase + "/SayTestDataBeanArray.java");
-        assertTrue(requestWrapperClass.exists());
-        responseWrapperClass = new File(output, pkgBase + "/SayTestDataBeanArrayResponse.java");
-        assertTrue(responseWrapperClass.exists());
-        contents = IOUtils.toString(new FileInputStream(requestWrapperClass));
-        assertTrue(contents.indexOf("org.apache.cxf.tools.fortest.withannotation.doc.TestDataBean[]") != -1);
-    }
-}
+/**
+ * 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.cxf.tools.java2wsdl.generator.wsdl11;
+
+import java.io.File;
+import java.io.FileInputStream;
+
+import org.apache.cxf.helpers.IOUtils;
+import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.tools.common.ProcessorTestBase;
+import org.apache.cxf.tools.common.ToolConstants;
+import org.apache.cxf.tools.java2wsdl.processor.JavaToProcessor;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class WrapperBeanGeneratorTest extends ProcessorTestBase {
+    JavaToProcessor processor = new JavaToProcessor();
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        processor.setEnvironment(env);
+    }
+
+    @After
+    public void tearDown() {
+        super.tearDown();
+    }
+    
+    private ServiceInfo getServiceInfo() {
+        return processor.getServiceBuilder().build();
+    }
+    
+    @Test
+    public void testGenInAnotherPackage() throws Exception {
+        String testingClass = "org.apache.cxf.tools.fortest.withannotation.doc.GreeterNoWrapperBean";
+        env.put(ToolConstants.CFG_CLASSNAME, testingClass);
+        
+        WrapperBeanGenerator generator = new WrapperBeanGenerator();
+        generator.setServiceModel(getServiceInfo());
+        
+        generator.generate(output);
+
+        String pkgBase = "org/apache/cxf";
+        File requestWrapperClass = new File(output, pkgBase + "/EchoDataBean.java");
+        assertTrue(requestWrapperClass.exists());
+        String contents = IOUtils.toString(new FileInputStream(requestWrapperClass));
+        assertTrue(contents.indexOf("org.apache.cxf.tools.fortest.withannotation.doc") != -1);
+        
+        File responseWrapperClass = new File(output, pkgBase + "/EchoDataBeanResponse.java");
+        assertTrue(responseWrapperClass.exists());
+
+        requestWrapperClass = new File(output, pkgBase + "/SayHi.java");
+        assertTrue(requestWrapperClass.exists());
+        responseWrapperClass = new File(output, pkgBase + "/SayHiResponse.java");
+        assertTrue(responseWrapperClass.exists());
+    }
+
+    @Test
+    public void testArray() throws Exception {
+        String testingClass = "org.apache.cxf.tools.fortest.withannotation.doc.GreeterArray";
+        env.put(ToolConstants.CFG_CLASSNAME, testingClass);
+        
+        WrapperBeanGenerator generator = new WrapperBeanGenerator();
+        generator.setServiceModel(getServiceInfo());
+        
+        generator.generate(output);
+
+        String pkgBase = "org/apache/cxf/tools/fortest/withannotation/doc/jaxws";
+        File requestWrapperClass = new File(output, pkgBase + "/SayIntArray.java");
+        assertTrue(requestWrapperClass.exists());
+        String contents = IOUtils.toString(new FileInputStream(requestWrapperClass));
+        assertTrue(contents.indexOf("int[]") != -1);
+        
+        File responseWrapperClass = new File(output, pkgBase + "/SayIntArrayResponse.java");
+        assertTrue(responseWrapperClass.exists());
+        contents = IOUtils.toString(new FileInputStream(responseWrapperClass));
+        assertTrue(contents.indexOf("_return") != -1);
+        
+        requestWrapperClass = new File(output, pkgBase + "/SayStringArray.java");
+        assertTrue(requestWrapperClass.exists());
+        responseWrapperClass = new File(output, pkgBase + "/SayStringArrayResponse.java");
+        assertTrue(responseWrapperClass.exists());
+
+        requestWrapperClass = new File(output, pkgBase + "/SayTestDataBeanArray.java");
+        assertTrue(requestWrapperClass.exists());
+        responseWrapperClass = new File(output, pkgBase + "/SayTestDataBeanArrayResponse.java");
+        assertTrue(responseWrapperClass.exists());
+        contents = IOUtils.toString(new FileInputStream(requestWrapperClass));
+        assertTrue(contents.indexOf("org.apache.cxf.tools.fortest.withannotation.doc.TestDataBean[]") != -1);
+    }
+}

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java Fri May 18 09:39:38 2007
@@ -1,64 +1,64 @@
-/**
- * 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.cxf.tools.java2wsdl.generator.wsdl11.annotator;
-
-import java.util.List;
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-import org.apache.cxf.tools.java2wsdl.generator.wsdl11.model.WrapperBeanClass;
-import org.junit.Test;
-
-public class WrapperBeanAnnotatorTest extends TestCase {
-
-    @Test
-    public void testAnnotate() {
-        String pkgName = "org.apache.cxf.tools.fortest.withannotation.doc.jaxws";
-        WrapperBeanClass clz = new WrapperBeanClass();
-        clz.setFullClassName(pkgName + ".SayHi");
-        clz.setElementName(new QName("http://doc.withannotation.fortest.tools.cxf.apache.org/", "sayHi"));
-
-        clz.annotate(new WrapperBeanAnnotator());
-        List<String> annotations = clz.getAnnotations();
-        
-        String expectedNamespace = "http://doc.withannotation.fortest.tools.cxf.apache.org/";
-        
-        assertTrue(annotations.contains("@XmlRootElement(namespace = \""
-                                        + expectedNamespace + "\", name = \"sayHi\")"));
-        assertTrue(annotations.contains("@XmlType(namespace = \""
-                                        + expectedNamespace + "\", name = \"sayHi\")"));
-        assertTrue(annotations.contains("@XmlAccessorType(XmlAccessType.FIELD)"));
-
-        
-        WrapperBeanClass resWrapperClass = new WrapperBeanClass();
-        resWrapperClass.setFullClassName(pkgName + ".SayHiResponse");
-        resWrapperClass.setElementName(new QName("http://doc.withannotation.fortest.tools.cxf.apache.org/",
-                                     "sayHiResponse"));
-        
-        resWrapperClass.annotate(new WrapperBeanAnnotator());
-        annotations = resWrapperClass.getAnnotations();
-        
-        assertTrue(annotations.contains("@XmlRootElement(namespace = \""
-                                        + expectedNamespace + "\", name = \"sayHiResponse\")"));
-        assertTrue(annotations.contains("@XmlType(namespace = \""
-                                        + expectedNamespace + "\", name = \"sayHiResponse\")"));
-        assertTrue(annotations.contains("@XmlAccessorType(XmlAccessType.FIELD)"));
-    }
-}
+/**
+ * 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.cxf.tools.java2wsdl.generator.wsdl11.annotator;
+
+import java.util.List;
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+import org.apache.cxf.tools.java2wsdl.generator.wsdl11.model.WrapperBeanClass;
+import org.junit.Test;
+
+public class WrapperBeanAnnotatorTest extends TestCase {
+
+    @Test
+    public void testAnnotate() {
+        String pkgName = "org.apache.cxf.tools.fortest.withannotation.doc.jaxws";
+        WrapperBeanClass clz = new WrapperBeanClass();
+        clz.setFullClassName(pkgName + ".SayHi");
+        clz.setElementName(new QName("http://doc.withannotation.fortest.tools.cxf.apache.org/", "sayHi"));
+
+        clz.annotate(new WrapperBeanAnnotator());
+        List<String> annotations = clz.getAnnotations();
+        
+        String expectedNamespace = "http://doc.withannotation.fortest.tools.cxf.apache.org/";
+        
+        assertTrue(annotations.contains("@XmlRootElement(namespace = \""
+                                        + expectedNamespace + "\", name = \"sayHi\")"));
+        assertTrue(annotations.contains("@XmlType(namespace = \""
+                                        + expectedNamespace + "\", name = \"sayHi\")"));
+        assertTrue(annotations.contains("@XmlAccessorType(XmlAccessType.FIELD)"));
+
+        
+        WrapperBeanClass resWrapperClass = new WrapperBeanClass();
+        resWrapperClass.setFullClassName(pkgName + ".SayHiResponse");
+        resWrapperClass.setElementName(new QName("http://doc.withannotation.fortest.tools.cxf.apache.org/",
+                                     "sayHiResponse"));
+        
+        resWrapperClass.annotate(new WrapperBeanAnnotator());
+        annotations = resWrapperClass.getAnnotations();
+        
+        assertTrue(annotations.contains("@XmlRootElement(namespace = \""
+                                        + expectedNamespace + "\", name = \"sayHiResponse\")"));
+        assertTrue(annotations.contains("@XmlType(namespace = \""
+                                        + expectedNamespace + "\", name = \"sayHiResponse\")"));
+        assertTrue(annotations.contains("@XmlAccessorType(XmlAccessType.FIELD)"));
+    }
+}

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java Fri May 18 09:39:38 2007
@@ -1,60 +1,60 @@
-/**
- * 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.cxf.tools.java2wsdl.generator.wsdl11.annotator;
-
-import junit.framework.TestCase;
-import org.apache.cxf.tools.common.model.JavaAnnotation;
-import org.apache.cxf.tools.common.model.JavaClass;
-import org.apache.cxf.tools.common.model.JavaField;
-import org.junit.Test;
-
-public class WrapperBeanFieldAnnotatorTest extends TestCase {
-
-    @Test
-    public void testAnnotate() {
-        JavaClass clz = new JavaClass();
-        clz.setFullClassName("org.apache.cxf.tools.fortest.withannotation.doc.jaxws.SayHi");
-
-        JavaField reqField = new JavaField("array",
-                                           "String[]",
-                                           "http://doc.withannotation.fortest.tools.cxf.apache.org/");
-
-        reqField.setOwner(clz);
-        JavaAnnotation annotation = reqField.getAnnotation();
-        assertNull(annotation);
-        
-        reqField.annotate(new WrapperBeanFieldAnnotator());
-        annotation = reqField.getAnnotation();
-
-        String expectedNamespace = "http://doc.withannotation.fortest.tools.cxf.apache.org/";
-        assertEquals("@XmlElement(namespace = \"" + expectedNamespace + "\", name = \"array\")",
-                     annotation.toString());
-
-        clz.setFullClassName("org.apache.cxf.tools.fortest.withannotation.doc.jaxws.SayHiResponse");
-        JavaField resField = new JavaField("return",
-                                           "String[]",
-                                           "http://doc.withannotation.fortest.tools.cxf.apache.org/");
-        resField.setOwner(clz);
-        resField.annotate(new WrapperBeanFieldAnnotator());
-        annotation = resField.getAnnotation();
-        assertEquals("@XmlElement(namespace = \"" + expectedNamespace + "\", name = \"return\")",
-                     annotation.toString());
-    }
-}
+/**
+ * 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.cxf.tools.java2wsdl.generator.wsdl11.annotator;
+
+import junit.framework.TestCase;
+import org.apache.cxf.tools.common.model.JavaAnnotation;
+import org.apache.cxf.tools.common.model.JavaClass;
+import org.apache.cxf.tools.common.model.JavaField;
+import org.junit.Test;
+
+public class WrapperBeanFieldAnnotatorTest extends TestCase {
+
+    @Test
+    public void testAnnotate() {
+        JavaClass clz = new JavaClass();
+        clz.setFullClassName("org.apache.cxf.tools.fortest.withannotation.doc.jaxws.SayHi");
+
+        JavaField reqField = new JavaField("array",
+                                           "String[]",
+                                           "http://doc.withannotation.fortest.tools.cxf.apache.org/");
+
+        reqField.setOwner(clz);
+        JavaAnnotation annotation = reqField.getAnnotation();
+        assertNull(annotation);
+        
+        reqField.annotate(new WrapperBeanFieldAnnotator());
+        annotation = reqField.getAnnotation();
+
+        String expectedNamespace = "http://doc.withannotation.fortest.tools.cxf.apache.org/";
+        assertEquals("@XmlElement(namespace = \"" + expectedNamespace + "\", name = \"array\")",
+                     annotation.toString());
+
+        clz.setFullClassName("org.apache.cxf.tools.fortest.withannotation.doc.jaxws.SayHiResponse");
+        JavaField resField = new JavaField("return",
+                                           "String[]",
+                                           "http://doc.withannotation.fortest.tools.cxf.apache.org/");
+        resField.setOwner(clz);
+        resField.annotate(new WrapperBeanFieldAnnotator());
+        annotation = resField.getAnnotation();
+        assertEquals("@XmlElement(namespace = \"" + expectedNamespace + "\", name = \"return\")",
+                     annotation.toString());
+    }
+}

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl Fri May 18 09:39:38 2007
@@ -1,86 +1,86 @@
-<?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 name="Calculator" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:ns1="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/">
-<xsd:element name="AddException" type="AddException"/>
-<xsd:complexType name="AddException">
-<xsd:sequence>
-<xsd:element name="message" nillable="true" type="xsd:string"/>
-</xsd:sequence>
-</xsd:complexType>
-<xsd:element name="add" type="add"/>
-<xsd:complexType name="add">
-<xsd:sequence>
-<xsd:element name="a" type="xsd:int"/>
-<xsd:element name="b" type="xsd:int"/>
-</xsd:sequence>
-</xsd:complexType>
-<xsd:element name="addResponse" type="addResponse"/>
-<xsd:complexType name="addResponse">
-<xsd:sequence>
-<xsd:element name="return" type="xsd:int"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="add">
-    <wsdl:part name="parameters" element="ns1:add">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="addResponse">
-    <wsdl:part name="parameters" element="ns1:addResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="AddException">
-    <wsdl:part name="fault" element="ns1:AddException">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="CalculatorPortType">
-    <wsdl:operation name="add">
-      <wsdl:input name="add" message="ns1:add">
-    </wsdl:input>
-      <wsdl:output name="addResponse" message="ns1:addResponse">
-    </wsdl:output>
-      <wsdl:fault name="AddException" message="ns1:AddException">
-    </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="CalculatorSoapBinding" type="ns1:CalculatorPortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="add">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="add">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="addResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="AddException">
-        <soap:fault name="AddException" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="Calculator">
-    <wsdl:port name="CalculatorPort" binding="ns1:CalculatorSoapBinding">
-      <soap:address location="http://localhost:9090/hello"/>
-    </wsdl:port>
-  </wsdl:service>
+<?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 name="Calculator" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:ns1="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/">
+<xsd:element name="AddException" type="AddException"/>
+<xsd:complexType name="AddException">
+<xsd:sequence>
+<xsd:element name="message" nillable="true" type="xsd:string"/>
+</xsd:sequence>
+</xsd:complexType>
+<xsd:element name="add" type="add"/>
+<xsd:complexType name="add">
+<xsd:sequence>
+<xsd:element name="a" type="xsd:int"/>
+<xsd:element name="b" type="xsd:int"/>
+</xsd:sequence>
+</xsd:complexType>
+<xsd:element name="addResponse" type="addResponse"/>
+<xsd:complexType name="addResponse">
+<xsd:sequence>
+<xsd:element name="return" type="xsd:int"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:schema>
+  </wsdl:types>
+  <wsdl:message name="add">
+    <wsdl:part name="parameters" element="ns1:add">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="addResponse">
+    <wsdl:part name="parameters" element="ns1:addResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="AddException">
+    <wsdl:part name="fault" element="ns1:AddException">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="CalculatorPortType">
+    <wsdl:operation name="add">
+      <wsdl:input name="add" message="ns1:add">
+    </wsdl:input>
+      <wsdl:output name="addResponse" message="ns1:addResponse">
+    </wsdl:output>
+      <wsdl:fault name="AddException" message="ns1:AddException">
+    </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="CalculatorSoapBinding" type="ns1:CalculatorPortType">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="add">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="add">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="addResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+      <wsdl:fault name="AddException">
+        <soap:fault name="AddException" use="literal"/>
+      </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="Calculator">
+    <wsdl:port name="CalculatorPort" binding="ns1:CalculatorSoapBinding">
+      <soap:address location="http://localhost:9090/hello"/>
+    </wsdl:port>
+  </wsdl:service>
 </wsdl:definitions>

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl Fri May 18 09:39:38 2007
@@ -1,114 +1,114 @@
-<?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 name="GreeterService" targetNamespace="http://apache.org/hello_world_soap12_http" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://apache.org/hello_world_soap12_http" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_soap12_http/types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://apache.org/hello_world_soap12_http/types" version="1.0">
-<xs:element name="faultDetail">
-<xs:complexType>
-<xs:sequence>
-<xs:element form="qualified" name="minor" type="xs:short"/>
-<xs:element form="qualified" name="major" type="xs:short"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-<xs:element name="pingMe">
-<xs:complexType/>
-</xs:element>
-<xs:element name="pingMeResponse">
-<xs:complexType/>
-</xs:element>
-<xs:element name="sayHi">
-<xs:complexType/>
-</xs:element>
-<xs:element name="sayHiResponse">
-<xs:complexType>
-<xs:sequence>
-<xs:element form="qualified" name="responseType" type="xs:string"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-</xs:schema>
-  </wsdl:types>
-  <wsdl:message name="sayHi">
-    <wsdl:part name="parameters" element="ns2:sayHi">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="sayHiResponse">
-    <wsdl:part name="parameters" element="ns2:sayHiResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="faultDetail">
-    <wsdl:part name="fault" element="ns2:faultDetail">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="pingMeResponse">
-    <wsdl:part name="parameters" element="ns2:pingMeResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="pingMe">
-    <wsdl:part name="parameters" element="ns2:pingMe">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="Greeter">
-    <wsdl:operation name="sayHi">
-      <wsdl:input name="sayHi" message="ns1:sayHi">
-    </wsdl:input>
-      <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="pingMe">
-      <wsdl:input name="pingMe" message="ns1:pingMe">
-    </wsdl:input>
-      <wsdl:output name="pingMeResponse" message="ns1:pingMeResponse">
-    </wsdl:output>
-      <wsdl:fault name="faultDetail" message="ns2:faultDetail">
-    </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Greeter">
-    <soap12:binding style="document" transport="http://www.w3.org/2003/05/soap/bindings/HTTP/"/>
-    <wsdl:operation name="sayHi">
-      <soap12:operation soapAction="" style="document"/>
-      <wsdl:input name="sayHi">
-        <soap12:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="sayHiResponse">
-        <soap12:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="pingMe">
-      <soap12:operation soapAction="" style="document"/>
-      <wsdl:input name="pingMe">
-        <soap12:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="pingMeResponse">
-        <soap12:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="faultDetail">
-        <soap12:fault name="faultDetail" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="GreeterService">
-    <wsdl:port name="GreeterPort" binding="ns1:GreeterServiceSoapBinding">
-      <soap12:address location="http://localhost:9090/hello"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
+<?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 name="GreeterService" targetNamespace="http://apache.org/hello_world_soap12_http" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://apache.org/hello_world_soap12_http" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_soap12_http/types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://apache.org/hello_world_soap12_http/types" version="1.0">
+<xs:element name="faultDetail">
+<xs:complexType>
+<xs:sequence>
+<xs:element form="qualified" name="minor" type="xs:short"/>
+<xs:element form="qualified" name="major" type="xs:short"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+<xs:element name="pingMe">
+<xs:complexType/>
+</xs:element>
+<xs:element name="pingMeResponse">
+<xs:complexType/>
+</xs:element>
+<xs:element name="sayHi">
+<xs:complexType/>
+</xs:element>
+<xs:element name="sayHiResponse">
+<xs:complexType>
+<xs:sequence>
+<xs:element form="qualified" name="responseType" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+</xs:schema>
+  </wsdl:types>
+  <wsdl:message name="sayHi">
+    <wsdl:part name="parameters" element="ns2:sayHi">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="sayHiResponse">
+    <wsdl:part name="parameters" element="ns2:sayHiResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="faultDetail">
+    <wsdl:part name="fault" element="ns2:faultDetail">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="pingMeResponse">
+    <wsdl:part name="parameters" element="ns2:pingMeResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="pingMe">
+    <wsdl:part name="parameters" element="ns2:pingMe">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="Greeter">
+    <wsdl:operation name="sayHi">
+      <wsdl:input name="sayHi" message="ns1:sayHi">
+    </wsdl:input>
+      <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="pingMe">
+      <wsdl:input name="pingMe" message="ns1:pingMe">
+    </wsdl:input>
+      <wsdl:output name="pingMeResponse" message="ns1:pingMeResponse">
+    </wsdl:output>
+      <wsdl:fault name="faultDetail" message="ns2:faultDetail">
+    </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Greeter">
+    <soap12:binding style="document" transport="http://www.w3.org/2003/05/soap/bindings/HTTP/"/>
+    <wsdl:operation name="sayHi">
+      <soap12:operation soapAction="" style="document"/>
+      <wsdl:input name="sayHi">
+        <soap12:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="sayHiResponse">
+        <soap12:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="pingMe">
+      <soap12:operation soapAction="" style="document"/>
+      <wsdl:input name="pingMe">
+        <soap12:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="pingMeResponse">
+        <soap12:body use="literal"/>
+      </wsdl:output>
+      <wsdl:fault name="faultDetail">
+        <soap12:fault name="faultDetail" use="literal"/>
+      </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="GreeterService">
+    <wsdl:port name="GreeterPort" binding="ns1:GreeterServiceSoapBinding">
+      <soap12:address location="http://localhost:9090/hello"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl Fri May 18 09:39:38 2007
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="MyService" targetNamespace="http://apache.org/hello_world_soap12_http" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://apache.org/hello_world_soap12_http" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_soap12_http/types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://apache.org/hello_world_soap12_http/types" version="1.0">
-<xs:element name="faultDetail">
-<xs:complexType>
-<xs:sequence>
-<xs:element form="qualified" name="minor" type="xs:short"/>
-<xs:element form="qualified" name="major" type="xs:short"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-<xs:element name="pingMe">
-<xs:complexType/>
-</xs:element>
-<xs:element name="pingMeResponse">
-<xs:complexType/>
-</xs:element>
-<xs:element name="sayHi">
-<xs:complexType/>
-</xs:element>
-<xs:element name="sayHiResponse">
-<xs:complexType>
-<xs:sequence>
-<xs:element form="qualified" name="responseType" type="xs:string"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-</xs:schema>
-  </wsdl:types>
-  <wsdl:message name="sayHi">
-    <wsdl:part name="parameters" element="ns2:sayHi">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="sayHiResponse">
-    <wsdl:part name="parameters" element="ns2:sayHiResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="faultDetail">
-    <wsdl:part name="fault" element="ns2:faultDetail">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="pingMeResponse">
-    <wsdl:part name="parameters" element="ns2:pingMeResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="pingMe">
-    <wsdl:part name="parameters" element="ns2:pingMe">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="Greeter">
-    <wsdl:operation name="sayHi">
-      <wsdl:input name="sayHi" message="ns1:sayHi">
-    </wsdl:input>
-      <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="pingMe">
-      <wsdl:input name="pingMe" message="ns1:pingMe">
-    </wsdl:input>
-      <wsdl:output name="pingMeResponse" message="ns1:pingMeResponse">
-    </wsdl:output>
-      <wsdl:fault name="faultDetail" message="ns2:faultDetail">
-    </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="MyServiceSoapBinding" type="ns1:Greeter">
-    <soap12:binding style="document" transport="http://www.w3.org/2003/05/soap/bindings/HTTP/"/>
-    <wsdl:operation name="sayHi">
-      <soap12:operation soapAction="" style="document"/>
-      <wsdl:input name="sayHi">
-        <soap12:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="sayHiResponse">
-        <soap12:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="pingMe">
-      <soap12:operation soapAction="" style="document"/>
-      <wsdl:input name="pingMe">
-        <soap12:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="pingMeResponse">
-        <soap12:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="faultDetail">
-        <soap12:fault name="faultDetail" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="MyService">
-    <wsdl:port name="GreeterPort" binding="ns1:MyServiceSoapBinding">
-      <soap12:address location="http://localhost:9090/hello"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="MyService" targetNamespace="http://apache.org/hello_world_soap12_http" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://apache.org/hello_world_soap12_http" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_soap12_http/types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://apache.org/hello_world_soap12_http/types" version="1.0">
+<xs:element name="faultDetail">
+<xs:complexType>
+<xs:sequence>
+<xs:element form="qualified" name="minor" type="xs:short"/>
+<xs:element form="qualified" name="major" type="xs:short"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+<xs:element name="pingMe">
+<xs:complexType/>
+</xs:element>
+<xs:element name="pingMeResponse">
+<xs:complexType/>
+</xs:element>
+<xs:element name="sayHi">
+<xs:complexType/>
+</xs:element>
+<xs:element name="sayHiResponse">
+<xs:complexType>
+<xs:sequence>
+<xs:element form="qualified" name="responseType" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+</xs:schema>
+  </wsdl:types>
+  <wsdl:message name="sayHi">
+    <wsdl:part name="parameters" element="ns2:sayHi">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="sayHiResponse">
+    <wsdl:part name="parameters" element="ns2:sayHiResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="faultDetail">
+    <wsdl:part name="fault" element="ns2:faultDetail">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="pingMeResponse">
+    <wsdl:part name="parameters" element="ns2:pingMeResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="pingMe">
+    <wsdl:part name="parameters" element="ns2:pingMe">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="Greeter">
+    <wsdl:operation name="sayHi">
+      <wsdl:input name="sayHi" message="ns1:sayHi">
+    </wsdl:input>
+      <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="pingMe">
+      <wsdl:input name="pingMe" message="ns1:pingMe">
+    </wsdl:input>
+      <wsdl:output name="pingMeResponse" message="ns1:pingMeResponse">
+    </wsdl:output>
+      <wsdl:fault name="faultDetail" message="ns2:faultDetail">
+    </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="MyServiceSoapBinding" type="ns1:Greeter">
+    <soap12:binding style="document" transport="http://www.w3.org/2003/05/soap/bindings/HTTP/"/>
+    <wsdl:operation name="sayHi">
+      <soap12:operation soapAction="" style="document"/>
+      <wsdl:input name="sayHi">
+        <soap12:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="sayHiResponse">
+        <soap12:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="pingMe">
+      <soap12:operation soapAction="" style="document"/>
+      <wsdl:input name="pingMe">
+        <soap12:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="pingMeResponse">
+        <soap12:body use="literal"/>
+      </wsdl:output>
+      <wsdl:fault name="faultDetail">
+        <soap12:fault name="faultDetail" use="literal"/>
+      </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="MyService">
+    <wsdl:port name="GreeterPort" binding="ns1:MyServiceSoapBinding">
+      <soap12:address location="http://localhost:9090/hello"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java Fri May 18 09:39:38 2007
@@ -1,52 +1,52 @@
-/**
- * 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.cxf.tools.java2wsdl.processor.internal.jaxws;
-
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-import org.apache.cxf.tools.common.model.JavaField;
-import org.apache.cxf.tools.java2wsdl.generator.wsdl11.model.WrapperBeanClass;
-import org.junit.Test;
-
-public class FaultBeanTest extends TestCase {
-
-    @Test
-    public void testTransform() throws Exception {
-        Class faultClass = Class.forName("org.apache.cxf.tools.fortest.cxf523.DBServiceFault");
-        FaultBean bean = new FaultBean();
-        WrapperBeanClass beanClass = bean.transform(faultClass, "org.apache.cxf.tools.fortest.cxf523.jaxws");
-
-        assertNotNull(beanClass);
-        assertEquals("DBServiceFaultBean", beanClass.getName());
-        assertEquals("org.apache.cxf.tools.fortest.cxf523.jaxws", beanClass.getPackageName());
-
-        assertEquals(1, beanClass.getFields().size());
-
-        JavaField field = beanClass.getFields().get(0);
-        assertEquals("message", field.getName());
-        assertEquals("java.lang.String", field.getType());
-
-        QName qname = beanClass.getElementName();
-        assertEquals("DBServiceFault", qname.getLocalPart());
-        assertEquals("http://cxf523.fortest.tools.cxf.apache.org/", qname.getNamespaceURI());
-    }
-}
+/**
+ * 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.cxf.tools.java2wsdl.processor.internal.jaxws;
+
+
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+import org.apache.cxf.tools.common.model.JavaField;
+import org.apache.cxf.tools.java2wsdl.generator.wsdl11.model.WrapperBeanClass;
+import org.junit.Test;
+
+public class FaultBeanTest extends TestCase {
+
+    @Test
+    public void testTransform() throws Exception {
+        Class faultClass = Class.forName("org.apache.cxf.tools.fortest.cxf523.DBServiceFault");
+        FaultBean bean = new FaultBean();
+        WrapperBeanClass beanClass = bean.transform(faultClass, "org.apache.cxf.tools.fortest.cxf523.jaxws");
+
+        assertNotNull(beanClass);
+        assertEquals("DBServiceFaultBean", beanClass.getName());
+        assertEquals("org.apache.cxf.tools.fortest.cxf523.jaxws", beanClass.getPackageName());
+
+        assertEquals(1, beanClass.getFields().size());
+
+        JavaField field = beanClass.getFields().get(0);
+        assertEquals("message", field.getName());
+        assertEquals("java.lang.String", field.getType());
+
+        QName qname = beanClass.getElementName();
+        assertEquals("DBServiceFault", qname.getLocalPart());
+        assertEquals("http://cxf523.fortest.tools.cxf.apache.org/", qname.getNamespaceURI());
+    }
+}

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java Fri May 18 09:39:38 2007
@@ -1,99 +1,99 @@
-/**
- * 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.cxf.tools.java2wsdl.processor.internal.jaxws;
-
-import java.io.File;
-
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.ProcessorTestBase;
-import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator;
-import org.junit.Before;
-import org.junit.Test;
-
-public class JaxwsServiceBuilderNoAnnoTest extends ProcessorTestBase {
-    JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
-    WSDL11Generator generator = new WSDL11Generator();
-    
-    
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-        builder.setBus(BusFactory.getDefaultBus());
-        generator.setBus(builder.getBus());
-    }
-
-    public void tearDown() {
-        
-    }
-    
-    @Test
-    public void testGeneratedWithElementryClass() throws Exception {
-        builder.setServiceClass(org.apache.cxf.tools.fortest.classnoanno.docbare.Stock.class);
-        builder.setAddress("http://localhost");
-        ServiceInfo service =  builder.build();
-        generator.setServiceModel(service);
-        File output = getOutputFile("stock_noanno_bare.wsdl");
-        generator.generate(output);
-        assertTrue(output.exists());
-        
-        String expectedFile = getClass().getResource("expected/stock_noanno_bare.wsdl").getFile();
-        assertFileEquals(expectedFile, output.getAbsolutePath());
-    }
-
-
-    @Test
-    public void testGeneratedWithDocWrappedClass() throws Exception {
-        builder.setServiceClass(org.apache.cxf.tools.fortest.classnoanno.docwrapped.Stock.class);
-        builder.setAddress("http://localhost");
-        ServiceInfo service =  builder.build();
-        generator.setServiceModel(service);
-        File output = getOutputFile("stock_noanno_wrapped.wsdl");
-        generator.generate(output);
-        assertTrue(output.exists());
-
-        String expectedFile = getClass().getResource("expected/stock_noanno_wrapped.wsdl").getFile();
-        assertFileEquals(expectedFile, output.getAbsolutePath());
-    }
-
-    // Revisit:
-    // * Missing wsdl:types
-    // * Binding style should be RPC not Document (FIXED CXF-522)
-    // * input message of binding operation "getPrice" MUST specify a value for the "namespace" attribute
-    // * output message of binding operation "getPrice" MUST specify a value for the "namespace" attribute
-    // CXF-527
-    @Test
-    public void testGeneratedWithRPCClass() throws Exception {
-        builder.setServiceClass(org.apache.cxf.tools.fortest.classnoanno.rpc.Stock.class);
-        builder.setAddress("http://localhost");
-        ServiceInfo service =  builder.build();
-        generator.setServiceModel(service);
-        File output = getOutputFile("stock_noanno_rpc.wsdl");
-        generator.generate(output);
-        assertTrue(output.exists());
-
-        String expectedFile = getClass().getResource("expected/stock_noanno_rpc.wsdl").getFile();
-        assertFileEquals(expectedFile, output.getAbsolutePath());
-    }
-
-    private File getOutputFile(String fileName) {
-        return new File(output, fileName);
-    }
-}
+/**
+ * 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.cxf.tools.java2wsdl.processor.internal.jaxws;
+
+import java.io.File;
+
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.tools.common.ProcessorTestBase;
+import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator;
+import org.junit.Before;
+import org.junit.Test;
+
+public class JaxwsServiceBuilderNoAnnoTest extends ProcessorTestBase {
+    JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
+    WSDL11Generator generator = new WSDL11Generator();
+    
+    
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        builder.setBus(BusFactory.getDefaultBus());
+        generator.setBus(builder.getBus());
+    }
+
+    public void tearDown() {
+        
+    }
+    
+    @Test
+    public void testGeneratedWithElementryClass() throws Exception {
+        builder.setServiceClass(org.apache.cxf.tools.fortest.classnoanno.docbare.Stock.class);
+        builder.setAddress("http://localhost");
+        ServiceInfo service =  builder.build();
+        generator.setServiceModel(service);
+        File output = getOutputFile("stock_noanno_bare.wsdl");
+        generator.generate(output);
+        assertTrue(output.exists());
+        
+        String expectedFile = getClass().getResource("expected/stock_noanno_bare.wsdl").getFile();
+        assertFileEquals(expectedFile, output.getAbsolutePath());
+    }
+
+
+    @Test
+    public void testGeneratedWithDocWrappedClass() throws Exception {
+        builder.setServiceClass(org.apache.cxf.tools.fortest.classnoanno.docwrapped.Stock.class);
+        builder.setAddress("http://localhost");
+        ServiceInfo service =  builder.build();
+        generator.setServiceModel(service);
+        File output = getOutputFile("stock_noanno_wrapped.wsdl");
+        generator.generate(output);
+        assertTrue(output.exists());
+
+        String expectedFile = getClass().getResource("expected/stock_noanno_wrapped.wsdl").getFile();
+        assertFileEquals(expectedFile, output.getAbsolutePath());
+    }
+
+    // Revisit:
+    // * Missing wsdl:types
+    // * Binding style should be RPC not Document (FIXED CXF-522)
+    // * input message of binding operation "getPrice" MUST specify a value for the "namespace" attribute
+    // * output message of binding operation "getPrice" MUST specify a value for the "namespace" attribute
+    // CXF-527
+    @Test
+    public void testGeneratedWithRPCClass() throws Exception {
+        builder.setServiceClass(org.apache.cxf.tools.fortest.classnoanno.rpc.Stock.class);
+        builder.setAddress("http://localhost");
+        ServiceInfo service =  builder.build();
+        generator.setServiceModel(service);
+        File output = getOutputFile("stock_noanno_rpc.wsdl");
+        generator.generate(output);
+        assertTrue(output.exists());
+
+        String expectedFile = getClass().getResource("expected/stock_noanno_rpc.wsdl").getFile();
+        assertFileEquals(expectedFile, output.getAbsolutePath());
+    }
+
+    private File getOutputFile(String fileName) {
+        return new File(output, fileName);
+    }
+}

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java Fri May 18 09:39:38 2007
@@ -1,65 +1,65 @@
-/**
- * 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.cxf.tools.java2wsdl.processor.internal.jaxws;
-
-import java.io.File;
-
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.ProcessorTestBase;
-import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator;
-import org.junit.Before;
-import org.junit.Test;
-
-public class JaxwsServiceBuilderRPCTest extends ProcessorTestBase {
-    JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
-    WSDL11Generator generator = new WSDL11Generator();
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-        builder.setBus(BusFactory.getDefaultBus());
-        generator.setBus(builder.getBus());
-    }
-
-    @org.junit.After
-    public void tearDown() {
-        super.tearDown();
-    }
-
-    @Test
-    public void testGreeter() throws Exception {
-        builder.setServiceClass(org.apache.cxf.tools.fortest.jaxws.rpc.Greeter.class);
-        ServiceInfo service = builder.build();
-        generator.setServiceModel(service);
-        File output = getOutputFile("rpc_greeter.wsdl");
-        assertNotNull(output);
-        generator.generate(output);
-        assertTrue(output.exists());
-
-        String expectedFile = this.getClass()
-            .getResource("expected/rpc_greeter.wsdl").getFile();
-        assertFileEquals(expectedFile, output.getAbsolutePath());
-    }
-
-    private File getOutputFile(String fileName) {
-        return new File(output, fileName);
-    }
-}
+/**
+ * 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.cxf.tools.java2wsdl.processor.internal.jaxws;
+
+import java.io.File;
+
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.tools.common.ProcessorTestBase;
+import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator;
+import org.junit.Before;
+import org.junit.Test;
+
+public class JaxwsServiceBuilderRPCTest extends ProcessorTestBase {
+    JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
+    WSDL11Generator generator = new WSDL11Generator();
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        builder.setBus(BusFactory.getDefaultBus());
+        generator.setBus(builder.getBus());
+    }
+
+    @org.junit.After
+    public void tearDown() {
+        super.tearDown();
+    }
+
+    @Test
+    public void testGreeter() throws Exception {
+        builder.setServiceClass(org.apache.cxf.tools.fortest.jaxws.rpc.Greeter.class);
+        ServiceInfo service = builder.build();
+        generator.setServiceModel(service);
+        File output = getOutputFile("rpc_greeter.wsdl");
+        assertNotNull(output);
+        generator.generate(output);
+        assertTrue(output.exists());
+
+        String expectedFile = this.getClass()
+            .getResource("expected/rpc_greeter.wsdl").getFile();
+        assertFileEquals(expectedFile, output.getAbsolutePath());
+    }
+
+    private File getOutputFile(String fileName) {
+        return new File(output, fileName);
+    }
+}

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java Fri May 18 09:39:38 2007
@@ -1,165 +1,165 @@
-/**
- * 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.cxf.tools.java2wsdl.processor.internal.jaxws;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import junit.framework.TestCase;
-import org.apache.cxf.service.model.MessageInfo;
-import org.apache.cxf.service.model.OperationInfo;
-import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.model.JavaClass;
-import org.apache.cxf.tools.common.model.JavaField;
-import org.apache.cxf.tools.common.model.JavaMethod;
-import org.junit.Test;
-
-public class RequestWrapperTest extends TestCase {
-    JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
-
-    private OperationInfo getOperation(Class clz, String opName) {
-        builder.setServiceClass(clz);
-        ServiceInfo serviceInfo = builder.build();
-
-        for (OperationInfo op : serviceInfo.getInterface().getOperations()) {
-            if (op.getUnwrappedOperation() != null
-                && op.hasInput() && opName.equals(op.getName().getLocalPart())) {
-                return op;
-            }
-        }
-        return null;        
-    }
-    
-    @Test
-    public void testBuildRequestFields() {
-        // Test String[]
-        Class testingClass = org.apache.cxf.tools.fortest.withannotation.doc.GreeterArray.class;
-        OperationInfo opInfo = getOperation(testingClass, "sayStringArray");
-        assertNotNull(opInfo);
-        
-        RequestWrapper requestWrapper = new RequestWrapper();
-
-        MessageInfo message = opInfo.getUnwrappedOperation().getInput();
-        Method method = (Method)opInfo.getProperty("operation.method");
-
-        List<JavaField> fields = requestWrapper.buildFields(method, message);
-        assertEquals(1, fields.size());
-        JavaField field = fields.get(0);
-        assertEquals("arg0", field.getName());
-        assertEquals("String[]", field.getType());
-
-        // Test int[]
-
-        opInfo = getOperation(testingClass, "sayIntArray");
-        assertNotNull(opInfo);
-
-        message = opInfo.getUnwrappedOperation().getInput();
-        method = (Method) opInfo.getProperty("operation.method");
-
-        fields = requestWrapper.buildFields(method, message);
-        assertEquals(1, fields.size());
-        field = fields.get(0);
-        assertEquals("arg0", field.getName());
-        assertEquals("int[]", field.getType());
-
-        // Test TestDataBean[]
-        
-        opInfo = getOperation(testingClass, "sayTestDataBeanArray");
-        assertNotNull(opInfo);
-
-        message = opInfo.getUnwrappedOperation().getInput();
-        method = (Method) opInfo.getProperty("operation.method");
-
-        fields = requestWrapper.buildFields(method, message);
-        assertEquals(1, fields.size());
-        field = fields.get(0);
-        assertEquals("arg0", field.getName());
-        assertEquals("org.apache.cxf.tools.fortest.withannotation.doc.TestDataBean[]", field.getType());
-    }
-
-    @Test
-    public void testNoAnnotationNoClass() throws Exception {
-        String pkgName = "org.apache.cxf.tools.fortest.classnoanno.docwrapped";
-        Class testingClass = Class.forName(pkgName + ".Stock");        
-
-        OperationInfo opInfo = getOperation(testingClass, "getPrice");
-        Wrapper wrapper = new RequestWrapper();
-        wrapper.setOperationInfo(opInfo);
-
-        assertTrue(wrapper.isWrapperAbsent());
-        assertTrue(wrapper.isToDifferentPackage());
-        assertFalse(wrapper.isWrapperBeanClassNotExist());
-        assertEquals(pkgName + ".jaxws", wrapper.getJavaClass().getPackageName());
-        assertEquals("GetPrice", wrapper.getJavaClass().getName());
-
-        JavaClass jClass = wrapper.buildWrapperBeanClass();
-        assertNotNull(jClass);
-        List<JavaField> jFields = jClass.getFields();
-
-        assertEquals(1, jFields.size());
-        assertEquals("arg0", jFields.get(0).getName());
-        assertEquals("java.lang.String", jFields.get(0).getClassName());
-        
-        List<JavaMethod> jMethods = jClass.getMethods();
-        assertEquals(2, jMethods.size());
-
-        JavaMethod jMethod = jMethods.get(0);
-        assertEquals("getArg0", jMethod.getName());
-        assertTrue(jMethod.getParameterListWithoutAnnotation().isEmpty());
-
-        jMethod = jMethods.get(1);
-        assertEquals("setArg0", jMethod.getName());
-        assertEquals(1, jMethod.getParameterListWithoutAnnotation().size());
-        assertEquals("java.lang.String newArg0", jMethod.getParameterListWithoutAnnotation().get(0));
-    }
-
-    @Test
-    public void testWithAnnotationNoClass() throws Exception {
-        String pkgName = "org.apache.cxf.tools.fortest.withannotation.doc";
-        Class testingClass = Class.forName(pkgName + ".Stock");
-
-        OperationInfo opInfo = getOperation(testingClass, "getPrice");
-        Wrapper wrapper = new RequestWrapper();
-        wrapper.setOperationInfo(opInfo);
-
-        assertFalse(wrapper.isWrapperAbsent());
-        assertTrue(wrapper.isToDifferentPackage());
-        assertFalse(wrapper.isWrapperBeanClassNotExist());
-        assertEquals(pkgName + ".jaxws", wrapper.getJavaClass().getPackageName());
-        assertEquals("GetPrice", wrapper.getJavaClass().getName());
-    }
-
-    @Test
-    public void testWithAnnotationWithClass() throws Exception {
-        String pkgName = "org.apache.cxf.tools.fortest.withannotation.doc";
-        Class testingClass = Class.forName(pkgName + ".Greeter");
-
-        OperationInfo opInfo = getOperation(testingClass, "sayHi");
-
-        Wrapper wrapper = new RequestWrapper();
-        wrapper.setOperationInfo(opInfo);
-
-        assertFalse(wrapper.isWrapperAbsent());
-        assertTrue(wrapper.isToDifferentPackage());
-        assertFalse(wrapper.isWrapperBeanClassNotExist());
-        assertEquals(pkgName, wrapper.getJavaClass().getPackageName());
-        assertEquals("SayHi", wrapper.getJavaClass().getName());
-    }
-}
+/**
+ * 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.cxf.tools.java2wsdl.processor.internal.jaxws;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import junit.framework.TestCase;
+import org.apache.cxf.service.model.MessageInfo;
+import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.tools.common.model.JavaClass;
+import org.apache.cxf.tools.common.model.JavaField;
+import org.apache.cxf.tools.common.model.JavaMethod;
+import org.junit.Test;
+
+public class RequestWrapperTest extends TestCase {
+    JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
+
+    private OperationInfo getOperation(Class clz, String opName) {
+        builder.setServiceClass(clz);
+        ServiceInfo serviceInfo = builder.build();
+
+        for (OperationInfo op : serviceInfo.getInterface().getOperations()) {
+            if (op.getUnwrappedOperation() != null
+                && op.hasInput() && opName.equals(op.getName().getLocalPart())) {
+                return op;
+            }
+        }
+        return null;        
+    }
+    
+    @Test
+    public void testBuildRequestFields() {
+        // Test String[]
+        Class testingClass = org.apache.cxf.tools.fortest.withannotation.doc.GreeterArray.class;
+        OperationInfo opInfo = getOperation(testingClass, "sayStringArray");
+        assertNotNull(opInfo);
+        
+        RequestWrapper requestWrapper = new RequestWrapper();
+
+        MessageInfo message = opInfo.getUnwrappedOperation().getInput();
+        Method method = (Method)opInfo.getProperty("operation.method");
+
+        List<JavaField> fields = requestWrapper.buildFields(method, message);
+        assertEquals(1, fields.size());
+        JavaField field = fields.get(0);
+        assertEquals("arg0", field.getName());
+        assertEquals("String[]", field.getType());
+
+        // Test int[]
+
+        opInfo = getOperation(testingClass, "sayIntArray");
+        assertNotNull(opInfo);
+
+        message = opInfo.getUnwrappedOperation().getInput();
+        method = (Method) opInfo.getProperty("operation.method");
+
+        fields = requestWrapper.buildFields(method, message);
+        assertEquals(1, fields.size());
+        field = fields.get(0);
+        assertEquals("arg0", field.getName());
+        assertEquals("int[]", field.getType());
+
+        // Test TestDataBean[]
+        
+        opInfo = getOperation(testingClass, "sayTestDataBeanArray");
+        assertNotNull(opInfo);
+
+        message = opInfo.getUnwrappedOperation().getInput();
+        method = (Method) opInfo.getProperty("operation.method");
+
+        fields = requestWrapper.buildFields(method, message);
+        assertEquals(1, fields.size());
+        field = fields.get(0);
+        assertEquals("arg0", field.getName());
+        assertEquals("org.apache.cxf.tools.fortest.withannotation.doc.TestDataBean[]", field.getType());
+    }
+
+    @Test
+    public void testNoAnnotationNoClass() throws Exception {
+        String pkgName = "org.apache.cxf.tools.fortest.classnoanno.docwrapped";
+        Class testingClass = Class.forName(pkgName + ".Stock");        
+
+        OperationInfo opInfo = getOperation(testingClass, "getPrice");
+        Wrapper wrapper = new RequestWrapper();
+        wrapper.setOperationInfo(opInfo);
+
+        assertTrue(wrapper.isWrapperAbsent());
+        assertTrue(wrapper.isToDifferentPackage());
+        assertFalse(wrapper.isWrapperBeanClassNotExist());
+        assertEquals(pkgName + ".jaxws", wrapper.getJavaClass().getPackageName());
+        assertEquals("GetPrice", wrapper.getJavaClass().getName());
+
+        JavaClass jClass = wrapper.buildWrapperBeanClass();
+        assertNotNull(jClass);
+        List<JavaField> jFields = jClass.getFields();
+
+        assertEquals(1, jFields.size());
+        assertEquals("arg0", jFields.get(0).getName());
+        assertEquals("java.lang.String", jFields.get(0).getClassName());
+        
+        List<JavaMethod> jMethods = jClass.getMethods();
+        assertEquals(2, jMethods.size());
+
+        JavaMethod jMethod = jMethods.get(0);
+        assertEquals("getArg0", jMethod.getName());
+        assertTrue(jMethod.getParameterListWithoutAnnotation().isEmpty());
+
+        jMethod = jMethods.get(1);
+        assertEquals("setArg0", jMethod.getName());
+        assertEquals(1, jMethod.getParameterListWithoutAnnotation().size());
+        assertEquals("java.lang.String newArg0", jMethod.getParameterListWithoutAnnotation().get(0));
+    }
+
+    @Test
+    public void testWithAnnotationNoClass() throws Exception {
+        String pkgName = "org.apache.cxf.tools.fortest.withannotation.doc";
+        Class testingClass = Class.forName(pkgName + ".Stock");
+
+        OperationInfo opInfo = getOperation(testingClass, "getPrice");
+        Wrapper wrapper = new RequestWrapper();
+        wrapper.setOperationInfo(opInfo);
+
+        assertFalse(wrapper.isWrapperAbsent());
+        assertTrue(wrapper.isToDifferentPackage());
+        assertFalse(wrapper.isWrapperBeanClassNotExist());
+        assertEquals(pkgName + ".jaxws", wrapper.getJavaClass().getPackageName());
+        assertEquals("GetPrice", wrapper.getJavaClass().getName());
+    }
+
+    @Test
+    public void testWithAnnotationWithClass() throws Exception {
+        String pkgName = "org.apache.cxf.tools.fortest.withannotation.doc";
+        Class testingClass = Class.forName(pkgName + ".Greeter");
+
+        OperationInfo opInfo = getOperation(testingClass, "sayHi");
+
+        Wrapper wrapper = new RequestWrapper();
+        wrapper.setOperationInfo(opInfo);
+
+        assertFalse(wrapper.isWrapperAbsent());
+        assertTrue(wrapper.isToDifferentPackage());
+        assertFalse(wrapper.isWrapperBeanClassNotExist());
+        assertEquals(pkgName, wrapper.getJavaClass().getPackageName());
+        assertEquals("SayHi", wrapper.getJavaClass().getName());
+    }
+}

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message