You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/05/18 18:39:48 UTC

svn commit: r539517 [7/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...

Modified: incubator/cxf/trunk/tools/jdee/src/main/java/org/apache/cxf/maven_plugin/jdee/JdeeMojo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/jdee/src/main/java/org/apache/cxf/maven_plugin/jdee/JdeeMojo.java?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/jdee/src/main/java/org/apache/cxf/maven_plugin/jdee/JdeeMojo.java (original)
+++ incubator/cxf/trunk/tools/jdee/src/main/java/org/apache/cxf/maven_plugin/jdee/JdeeMojo.java Fri May 18 09:39:38 2007
@@ -1,188 +1,188 @@
-/**
- * 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.maven_plugin.jdee;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.cxf.tools.wsdlto.core.VelocityWriter;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-
-/**
- * A super-simple Mojo to emit JDEE project files.
- *
- * @goal jdee
- * @description Outputs a JDEE project file.
- * @requiresDependencyResolution test
- */
-
-// TODO: 
-//       * include the generated srouce root
-//
-
-public class JdeeMojo extends AbstractMojo {
-    /**
-     * The Maven Project.
-     *
-     * @parameter expression="${project}"
-     * @required
-     * @readonly
-     */
-    protected MavenProject project;
-
-    /**
-     * @component
-     */
-    protected ArtifactFactory artifactFactory;
-
-    /**
-     * Build directory
-     *
-     * @parameter expression="${project.build.outputDirectory}"
-     * @required
-     */
-    private File buildDirectory;
-
-    /**
-     * The set of dependencies required by the project 
-     * @parameter default-value="${project.artifacts}"
-     * @required
-     * @readonly
-     */
-    private java.util.Set dependencies;
-
-
-    private String getVelocityLogFile(String log) {
-        return new File(buildDirectory, log).toString();
-    }
-
-    @SuppressWarnings("unchecked")
-    private Set<String> getSourceDirs() throws Exception {
-        Set<String> results = new HashSet<String>();
-        File file = new File(".jdee_sources");
-        if (file.exists()) {
-            results.addAll(FileUtils.readLines(file));
-        } else {
-            file.createNewFile();
-        }
-
-        results.addAll(emitPaths(project.getCompileSourceRoots()));
-        results.addAll(emitPaths(project.getTestCompileSourceRoots()));
-        FileUtils.writeLines(file, results);
-        return results;
-    }
-
-    @SuppressWarnings("unchecked")
-    private Set<String> getGlobalClasspath() throws Exception {
-        Set<String> results = new HashSet<String>();
-        File file = new File(".jdee_classpath");
-        if (file.exists()) {
-            results.addAll(FileUtils.readLines(file));            
-        } else {
-            file.createNewFile();
-        }
-
-        results.addAll(emitPaths(project.getCompileClasspathElements()));
-        results.addAll(emitPaths(project.getTestClasspathElements()));
-        results.addAll(emitPaths(project.getSystemClasspathElements()));
-        results.addAll(getDependencies());
-        FileUtils.writeLines(file, results);
-        return results;
-    }
-
-    private Set<String> getDependencies() throws Exception {
-        Set<String> results = new HashSet<String>();
-        if (dependencies != null && !dependencies.isEmpty()) {
-            for (Iterator it = dependencies.iterator(); it.hasNext();) {
-                Artifact artifact = (Artifact)it.next();
-                results.add(artifact.getFile().toString().replace("\\", "/"));
-            }
-        }
-        return results;
-    }
-
-    private Set<String> emitPaths(List paths) throws IOException {
-        Set<String> np = new HashSet<String>();
-        for (Object path : paths) {
-            np.add(path.toString().replace("\\", "/"));
-        }
-        return np;
-    }
-
-    // TODO: Reuse the velocity in the tools 
-    private void initVelocity() throws Exception {
-        Properties props = new Properties();
-        String clzName = "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader";
-        props.put("resource.loader", "class");
-        props.put("class.resource.loader.class", clzName);
-        props.put("runtime.log", getVelocityLogFile("velocity.log"));
-
-        Velocity.init(props);
-    }
-
-    private void generatePrj() throws Exception {
-        initVelocity();
-
-        String templateFile = "/org/apache/cxf/maven_plugin/jdee/prj.vm";
-        Template tmpl = Velocity.getTemplate(templateFile);
-        if (tmpl == null) {
-            throw new RuntimeException("Can not load template file: " + templateFile);
-        }
-
-        File outputFile = new File("prj.el");
-        
-        VelocityContext ctx = new VelocityContext();
-        ctx.put("SOURCE_DIRS", getSourceDirs());
-        ctx.put("GLOBAL_CP", getGlobalClasspath());
-
-        Writer outputs = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(outputFile)),
-                                                "UTF-8");
-        VelocityWriter writer = new VelocityWriter(outputs);
-
-        tmpl.merge(ctx, writer);
-        writer.close();
-    }
-
-    public void execute() throws MojoExecutionException {
-        try {
-            generatePrj();
-        } catch (Exception e) {
-            getLog().debug(e);
-            throw new MojoExecutionException(e.getMessage(), e);
-        }
-    }
-}
+/**
+ * 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.maven_plugin.jdee;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.cxf.tools.wsdlto.core.VelocityWriter;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+
+/**
+ * A super-simple Mojo to emit JDEE project files.
+ *
+ * @goal jdee
+ * @description Outputs a JDEE project file.
+ * @requiresDependencyResolution test
+ */
+
+// TODO: 
+//       * include the generated srouce root
+//
+
+public class JdeeMojo extends AbstractMojo {
+    /**
+     * The Maven Project.
+     *
+     * @parameter expression="${project}"
+     * @required
+     * @readonly
+     */
+    protected MavenProject project;
+
+    /**
+     * @component
+     */
+    protected ArtifactFactory artifactFactory;
+
+    /**
+     * Build directory
+     *
+     * @parameter expression="${project.build.outputDirectory}"
+     * @required
+     */
+    private File buildDirectory;
+
+    /**
+     * The set of dependencies required by the project 
+     * @parameter default-value="${project.artifacts}"
+     * @required
+     * @readonly
+     */
+    private java.util.Set dependencies;
+
+
+    private String getVelocityLogFile(String log) {
+        return new File(buildDirectory, log).toString();
+    }
+
+    @SuppressWarnings("unchecked")
+    private Set<String> getSourceDirs() throws Exception {
+        Set<String> results = new HashSet<String>();
+        File file = new File(".jdee_sources");
+        if (file.exists()) {
+            results.addAll(FileUtils.readLines(file));
+        } else {
+            file.createNewFile();
+        }
+
+        results.addAll(emitPaths(project.getCompileSourceRoots()));
+        results.addAll(emitPaths(project.getTestCompileSourceRoots()));
+        FileUtils.writeLines(file, results);
+        return results;
+    }
+
+    @SuppressWarnings("unchecked")
+    private Set<String> getGlobalClasspath() throws Exception {
+        Set<String> results = new HashSet<String>();
+        File file = new File(".jdee_classpath");
+        if (file.exists()) {
+            results.addAll(FileUtils.readLines(file));            
+        } else {
+            file.createNewFile();
+        }
+
+        results.addAll(emitPaths(project.getCompileClasspathElements()));
+        results.addAll(emitPaths(project.getTestClasspathElements()));
+        results.addAll(emitPaths(project.getSystemClasspathElements()));
+        results.addAll(getDependencies());
+        FileUtils.writeLines(file, results);
+        return results;
+    }
+
+    private Set<String> getDependencies() throws Exception {
+        Set<String> results = new HashSet<String>();
+        if (dependencies != null && !dependencies.isEmpty()) {
+            for (Iterator it = dependencies.iterator(); it.hasNext();) {
+                Artifact artifact = (Artifact)it.next();
+                results.add(artifact.getFile().toString().replace("\\", "/"));
+            }
+        }
+        return results;
+    }
+
+    private Set<String> emitPaths(List paths) throws IOException {
+        Set<String> np = new HashSet<String>();
+        for (Object path : paths) {
+            np.add(path.toString().replace("\\", "/"));
+        }
+        return np;
+    }
+
+    // TODO: Reuse the velocity in the tools 
+    private void initVelocity() throws Exception {
+        Properties props = new Properties();
+        String clzName = "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader";
+        props.put("resource.loader", "class");
+        props.put("class.resource.loader.class", clzName);
+        props.put("runtime.log", getVelocityLogFile("velocity.log"));
+
+        Velocity.init(props);
+    }
+
+    private void generatePrj() throws Exception {
+        initVelocity();
+
+        String templateFile = "/org/apache/cxf/maven_plugin/jdee/prj.vm";
+        Template tmpl = Velocity.getTemplate(templateFile);
+        if (tmpl == null) {
+            throw new RuntimeException("Can not load template file: " + templateFile);
+        }
+
+        File outputFile = new File("prj.el");
+        
+        VelocityContext ctx = new VelocityContext();
+        ctx.put("SOURCE_DIRS", getSourceDirs());
+        ctx.put("GLOBAL_CP", getGlobalClasspath());
+
+        Writer outputs = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(outputFile)),
+                                                "UTF-8");
+        VelocityWriter writer = new VelocityWriter(outputs);
+
+        tmpl.merge(ctx, writer);
+        writer.close();
+    }
+
+    public void execute() throws MojoExecutionException {
+        try {
+            generatePrj();
+        } catch (Exception e) {
+            getLog().debug(e);
+            throw new MojoExecutionException(e.getMessage(), e);
+        }
+    }
+}

Propchange: incubator/cxf/trunk/tools/jdee/src/main/java/org/apache/cxf/maven_plugin/jdee/JdeeMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/jdee/src/main/java/org/apache/cxf/maven_plugin/jdee/JdeeMojo.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test.wsdl?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test.wsdl (original)
+++ incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test.wsdl Fri May 18 09:39:38 2007
@@ -1,172 +1,172 @@
-<?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.
--->
-<definitions name="HelloWorldService" 
-    targetNamespace="http://cxf.apache.org/hello_world_jms" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:jms="http://cxf.apache.org/transports/jms" 
-    xmlns:x1="http://cxf.apache.org/hello_world_jms/types"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://cxf.apache.org/hello_world_jms" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <types>
-        <schema targetNamespace="http://cxf.apache.org/hello_world_jms/types"      
-		xmlns="http://www.w3.org/2001/XMLSchema" 
-		xmlns:x1="http://cxf.apache.org/hello_world_jms/types" 
-		elementFormDefault="qualified">
-            <complexType name="ErrorCode">
-                 <sequence>
-                    <element name="minor" type="short"/>
-                    <element name="major" type="short"/>
-                </sequence>
-            </complexType>
-                <complexType name="testRpcLitFault">
-                    <sequence>
-                        <element name="faultType" type="string"/>
-                    </sequence>
-                </complexType>
-                <complexType name="testRpcLitFaultResponse">
-                    <sequence/>
-                </complexType>
-
-                <complexType name="NoSuchCodeLit">
-                    <sequence>
-                        <element name="code" type="x1:ErrorCode"/>
-                    </sequence>
-                </complexType>
-            <complexType name="BadRecord">
-                <sequence>
-                    <element name="reason" type="string"/>
-                    <element name="code" type="short"/>
-                </sequence>
-            </complexType>
-        </schema>
-    </types>
-
-    <message name="greetMe">
-        <part name="stringParam0" type="xsd:string"/>
-    </message>
-    <message name="greetMeResponse">
-        <part name="return" type="xsd:string"/>
-    </message>
-    <message name="sayHi"/>
-    <message name="sayHiResponse">
-        <part name="return" type="xsd:string"/>
-    </message>
-    <message name="greetMeOneWay">
-        <part name="stringParam0" type="xsd:string"/>
-    </message>
-    
-    <message name="testRpcLitFaultRequest">
-        <part name="in" type="xsd:string"/>
-    </message>
-    <message name="testRpcLitFaultResponse">
-        <part name="out" type="x1:testRpcLitFaultResponse"/>
-    </message>
-    <message name="NoSuchCodeLitFault">
-        <part name="NoSuchCodeLit" type="x1:NoSuchCodeLit"/>
-    </message>
-    <message name="BadRecordLitFault">
-        <part name="BadRecordLit" type="xsd:string"/>
-    </message>
-    
-    <portType name="HelloWorldPortType">
-        <operation name="greetMe">
-            <input message="tns:greetMe" name="greetMe"/>
-            <output message="tns:greetMeResponse" name="greetMeResponse"/>
-        </operation>
-        <operation name="sayHi">
-            <input message="tns:sayHi" name="sayHi"/>
-            <output message="tns:sayHiResponse" name="sayHiResponse"/>
-        </operation>
-        <operation name="greetMeOneWay">
-            <input message="tns:greetMeOneWay" name="greetMeOneWay"/>
-        </operation>
-        <operation name="testRpcLitFault">
-            <input name="testRpcLitFaultRequest" message="tns:testRpcLitFaultRequest"/>
-            <output name="testRpcLitFaultResponse" message="tns:testRpcLitFaultResponse"/>
-            <fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault"/>
-            <fault name="BadRecordLitFault" message="tns:BadRecordLitFault"/>
-        </operation>
-    </portType>
-
-    <binding name="HelloWorldPortBinding" type="tns:HelloWorldPortType">
-        <soap:binding style="rpc" transport="http://cxf.apache.org/transports/jms"/>
-        <operation name="greetMe">
-            <soap:operation soapAction="" style="rpc"/>
-            <input name="greetMe">
-                <soap:body 
-                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
-            </input>
-            <output name="greetMeResponse">
-                <soap:body  
-                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
-            </output>
-        </operation>
-        <operation name="sayHi">
-            <soap:operation soapAction="" style="rpc"/>
-            <input name="sayHi">
-                <soap:body 
-                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
-            </input>
-            <output name="sayHiResponse">
-                <soap:body 
-                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
-            </output>
-        </operation>
-        <operation name="greetMeOneWay">
-            <soap:operation style="rpc"/>
-            <input name="greetMeOneWay">
-                <soap:body 
-                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
-            </input>
-        </operation>
-
-         <operation name="testRpcLitFault">
-            <soap:operation style="rpc"/>
-            <input>
-                <soap:body namespace="http://cxf.apache.org/hello_world_jms"  use="literal"/>
-            </input>
-            <output>
-                <soap:body namespace="http://cxf.apache.org/hello_world_jms"  use="literal"/>
-            </output>
-            <fault name="NoSuchCodeLitFault">
-                <soap:fault name="NoSuchCodeLitFault" namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
-            </fault>
-            <fault name="BadRecordLitFault">
-                <soap:fault name="BadRecordLitFault" namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
-            </fault>
-        </operation>
-    </binding>
-
-    <service name="HelloWorldService">
-           <port binding="tns:HelloWorldPortBinding" name="HelloWorldPort">
-               <jms:address
-                   jndiConnectionFactoryName="ConnectionFactory" 
-                   jndiDestinationName="dynamicQueues/test.jmstransport.text">
-                   <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                   <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-               </jms:address>
-            
-               <jms:server durableSubscriberName="CXF_subscriber"/>
-           </port>
-    </service>
-</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.
+-->
+<definitions name="HelloWorldService" 
+    targetNamespace="http://cxf.apache.org/hello_world_jms" 
+    xmlns="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:jms="http://cxf.apache.org/transports/jms" 
+    xmlns:x1="http://cxf.apache.org/hello_world_jms/types"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:tns="http://cxf.apache.org/hello_world_jms" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <types>
+        <schema targetNamespace="http://cxf.apache.org/hello_world_jms/types"      
+		xmlns="http://www.w3.org/2001/XMLSchema" 
+		xmlns:x1="http://cxf.apache.org/hello_world_jms/types" 
+		elementFormDefault="qualified">
+            <complexType name="ErrorCode">
+                 <sequence>
+                    <element name="minor" type="short"/>
+                    <element name="major" type="short"/>
+                </sequence>
+            </complexType>
+                <complexType name="testRpcLitFault">
+                    <sequence>
+                        <element name="faultType" type="string"/>
+                    </sequence>
+                </complexType>
+                <complexType name="testRpcLitFaultResponse">
+                    <sequence/>
+                </complexType>
+
+                <complexType name="NoSuchCodeLit">
+                    <sequence>
+                        <element name="code" type="x1:ErrorCode"/>
+                    </sequence>
+                </complexType>
+            <complexType name="BadRecord">
+                <sequence>
+                    <element name="reason" type="string"/>
+                    <element name="code" type="short"/>
+                </sequence>
+            </complexType>
+        </schema>
+    </types>
+
+    <message name="greetMe">
+        <part name="stringParam0" type="xsd:string"/>
+    </message>
+    <message name="greetMeResponse">
+        <part name="return" type="xsd:string"/>
+    </message>
+    <message name="sayHi"/>
+    <message name="sayHiResponse">
+        <part name="return" type="xsd:string"/>
+    </message>
+    <message name="greetMeOneWay">
+        <part name="stringParam0" type="xsd:string"/>
+    </message>
+    
+    <message name="testRpcLitFaultRequest">
+        <part name="in" type="xsd:string"/>
+    </message>
+    <message name="testRpcLitFaultResponse">
+        <part name="out" type="x1:testRpcLitFaultResponse"/>
+    </message>
+    <message name="NoSuchCodeLitFault">
+        <part name="NoSuchCodeLit" type="x1:NoSuchCodeLit"/>
+    </message>
+    <message name="BadRecordLitFault">
+        <part name="BadRecordLit" type="xsd:string"/>
+    </message>
+    
+    <portType name="HelloWorldPortType">
+        <operation name="greetMe">
+            <input message="tns:greetMe" name="greetMe"/>
+            <output message="tns:greetMeResponse" name="greetMeResponse"/>
+        </operation>
+        <operation name="sayHi">
+            <input message="tns:sayHi" name="sayHi"/>
+            <output message="tns:sayHiResponse" name="sayHiResponse"/>
+        </operation>
+        <operation name="greetMeOneWay">
+            <input message="tns:greetMeOneWay" name="greetMeOneWay"/>
+        </operation>
+        <operation name="testRpcLitFault">
+            <input name="testRpcLitFaultRequest" message="tns:testRpcLitFaultRequest"/>
+            <output name="testRpcLitFaultResponse" message="tns:testRpcLitFaultResponse"/>
+            <fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault"/>
+            <fault name="BadRecordLitFault" message="tns:BadRecordLitFault"/>
+        </operation>
+    </portType>
+
+    <binding name="HelloWorldPortBinding" type="tns:HelloWorldPortType">
+        <soap:binding style="rpc" transport="http://cxf.apache.org/transports/jms"/>
+        <operation name="greetMe">
+            <soap:operation soapAction="" style="rpc"/>
+            <input name="greetMe">
+                <soap:body 
+                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
+            </input>
+            <output name="greetMeResponse">
+                <soap:body  
+                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
+            </output>
+        </operation>
+        <operation name="sayHi">
+            <soap:operation soapAction="" style="rpc"/>
+            <input name="sayHi">
+                <soap:body 
+                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
+            </input>
+            <output name="sayHiResponse">
+                <soap:body 
+                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
+            </output>
+        </operation>
+        <operation name="greetMeOneWay">
+            <soap:operation style="rpc"/>
+            <input name="greetMeOneWay">
+                <soap:body 
+                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
+            </input>
+        </operation>
+
+         <operation name="testRpcLitFault">
+            <soap:operation style="rpc"/>
+            <input>
+                <soap:body namespace="http://cxf.apache.org/hello_world_jms"  use="literal"/>
+            </input>
+            <output>
+                <soap:body namespace="http://cxf.apache.org/hello_world_jms"  use="literal"/>
+            </output>
+            <fault name="NoSuchCodeLitFault">
+                <soap:fault name="NoSuchCodeLitFault" namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
+            </fault>
+            <fault name="BadRecordLitFault">
+                <soap:fault name="BadRecordLitFault" namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
+            </fault>
+        </operation>
+    </binding>
+
+    <service name="HelloWorldService">
+           <port binding="tns:HelloWorldPortBinding" name="HelloWorldPort">
+               <jms:address
+                   jndiConnectionFactoryName="ConnectionFactory" 
+                   jndiDestinationName="dynamicQueues/test.jmstransport.text">
+                   <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+                   <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
+               </jms:address>
+            
+               <jms:server durableSubscriberName="CXF_subscriber"/>
+           </port>
+    </service>
+</definitions>
+
+

Propchange: incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test2.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test2.wsdl?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test2.wsdl (original)
+++ incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test2.wsdl Fri May 18 09:39:38 2007
@@ -1,172 +1,172 @@
-<?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.
--->
-<definitions name="HelloWorldService" 
-    targetNamespace="http://cxf.apache.org/hello_world_jms" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:jms="http://cxf.apache.org/transports/jms" 
-    xmlns:x1="http://cxf.apache.org/hello_world_jms/types"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://cxf.apache.org/hello_world_jms" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <types>
-        <schema targetNamespace="http://cxf.apache.org/hello_world_jms/types"      
-		xmlns="http://www.w3.org/2001/XMLSchema" 
-		xmlns:x1="http://cxf.apache.org/hello_world_jms/types" 
-		elementFormDefault="qualified">
-            <complexType name="ErrorCode">
-                 <sequence>
-                    <element name="minor" type="short"/>
-                    <element name="major" type="short"/>
-                </sequence>
-            </complexType>
-                <complexType name="testRpcLitFault">
-                    <sequence>
-                        <element name="faultType" type="string"/>
-                    </sequence>
-                </complexType>
-                <complexType name="testRpcLitFaultResponse">
-                    <sequence/>
-                </complexType>
-
-                <complexType name="NoSuchCodeLit">
-                    <sequence>
-                        <element name="code" type="x1:ErrorCode"/>
-                    </sequence>
-                </complexType>
-            <complexType name="BadRecord">
-                <sequence>
-                    <element name="reason" type="string"/>
-                    <element name="code" type="short"/>
-                </sequence>
-            </complexType>
-        </schema>
-    </types>
-
-    <message name="greetMe">
-        <part name="stringParam0" type="xsd:string"/>
-    </message>
-    <message name="greetMeResponse">
-        <part name="return" type="xsd:string"/>
-    </message>
-    <message name="sayHi"/>
-    <message name="sayHiResponse">
-        <part name="return" type="xsd:string"/>
-    </message>
-    <message name="greetMeOneWay">
-        <part name="stringParam0" type="xsd:string"/>
-    </message>
-    
-    <message name="testRpcLitFaultRequest">
-        <part name="in" type="xsd:string"/>
-    </message>
-    <message name="testRpcLitFaultResponse">
-        <part name="out" type="x1:testRpcLitFaultResponse"/>
-    </message>
-    <message name="NoSuchCodeLitFault">
-        <part name="NoSuchCodeLit" type="x1:NoSuchCodeLit"/>
-    </message>
-    <message name="BadRecordLitFault">
-        <part name="BadRecordLit" type="xsd:string"/>
-    </message>
-    
-    <portType name="HelloWorldPortType">
-        <operation name="greetMe">
-            <input message="tns:greetMe" name="greetMe"/>
-            <output message="tns:greetMeResponse" name="greetMeResponse"/>
-        </operation>
-        <operation name="sayHi">
-            <input message="tns:sayHi" name="sayHi"/>
-            <output message="tns:sayHiResponse" name="sayHiResponse"/>
-        </operation>
-        <operation name="greetMeOneWay">
-            <input message="tns:greetMeOneWay" name="greetMeOneWay"/>
-        </operation>
-        <operation name="testRpcLitFault">
-            <input name="testRpcLitFaultRequest" message="tns:testRpcLitFaultRequest"/>
-            <output name="testRpcLitFaultResponse" message="tns:testRpcLitFaultResponse"/>
-            <fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault"/>
-            <fault name="BadRecordLitFault" message="tns:BadRecordLitFault"/>
-        </operation>
-    </portType>
-
-    <binding name="HelloWorldPortBinding" type="tns:HelloWorldPortType">
-        <soap:binding style="rpc" transport="http://cxf.apache.org/transports/jms"/>
-        <operation name="greetMe">
-            <soap:operation soapAction="" style="rpc"/>
-            <input name="greetMe">
-                <soap:body 
-                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
-            </input>
-            <output name="greetMeResponse">
-                <soap:body  
-                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
-            </output>
-        </operation>
-        <operation name="sayHi">
-            <soap:operation soapAction="" style="rpc"/>
-            <input name="sayHi">
-                <soap:body 
-                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
-            </input>
-            <output name="sayHiResponse">
-                <soap:body 
-                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
-            </output>
-        </operation>
-        <operation name="greetMeOneWay">
-            <soap:operation style="rpc"/>
-            <input name="greetMeOneWay">
-                <soap:body 
-                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
-            </input>
-        </operation>
-
-         <operation name="testRpcLitFault">
-            <soap:operation style="rpc"/>
-            <input>
-                <soap:body namespace="http://cxf.apache.org/hello_world_jms"  use="literal"/>
-            </input>
-            <output>
-                <soap:body namespace="http://cxf.apache.org/hello_world_jms"  use="literal"/>
-            </output>
-            <fault name="NoSuchCodeLitFault">
-                <soap:fault name="NoSuchCodeLitFault" use="literal"/>
-            </fault>
-            <fault name="BadRecordLitFault">
-                <soap:fault name="BadRecordLitFault" use="literal"/>
-            </fault>
-        </operation>
-    </binding>
-
-    <service name="HelloWorldService">
-           <port binding="tns:HelloWorldPortBinding" name="HelloWorldPort">
-               <jms:address
-                   jndiConnectionFactoryName="ConnectionFactory" 
-                   jndiDestinationName="dynamicQueues/test.jmstransport.text">
-                   <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                   <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-               </jms:address>
-            
-               <jms:server durableSubscriberName="CXF_subscriber"/>
-           </port>
-    </service>
-</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.
+-->
+<definitions name="HelloWorldService" 
+    targetNamespace="http://cxf.apache.org/hello_world_jms" 
+    xmlns="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:jms="http://cxf.apache.org/transports/jms" 
+    xmlns:x1="http://cxf.apache.org/hello_world_jms/types"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:tns="http://cxf.apache.org/hello_world_jms" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <types>
+        <schema targetNamespace="http://cxf.apache.org/hello_world_jms/types"      
+		xmlns="http://www.w3.org/2001/XMLSchema" 
+		xmlns:x1="http://cxf.apache.org/hello_world_jms/types" 
+		elementFormDefault="qualified">
+            <complexType name="ErrorCode">
+                 <sequence>
+                    <element name="minor" type="short"/>
+                    <element name="major" type="short"/>
+                </sequence>
+            </complexType>
+                <complexType name="testRpcLitFault">
+                    <sequence>
+                        <element name="faultType" type="string"/>
+                    </sequence>
+                </complexType>
+                <complexType name="testRpcLitFaultResponse">
+                    <sequence/>
+                </complexType>
+
+                <complexType name="NoSuchCodeLit">
+                    <sequence>
+                        <element name="code" type="x1:ErrorCode"/>
+                    </sequence>
+                </complexType>
+            <complexType name="BadRecord">
+                <sequence>
+                    <element name="reason" type="string"/>
+                    <element name="code" type="short"/>
+                </sequence>
+            </complexType>
+        </schema>
+    </types>
+
+    <message name="greetMe">
+        <part name="stringParam0" type="xsd:string"/>
+    </message>
+    <message name="greetMeResponse">
+        <part name="return" type="xsd:string"/>
+    </message>
+    <message name="sayHi"/>
+    <message name="sayHiResponse">
+        <part name="return" type="xsd:string"/>
+    </message>
+    <message name="greetMeOneWay">
+        <part name="stringParam0" type="xsd:string"/>
+    </message>
+    
+    <message name="testRpcLitFaultRequest">
+        <part name="in" type="xsd:string"/>
+    </message>
+    <message name="testRpcLitFaultResponse">
+        <part name="out" type="x1:testRpcLitFaultResponse"/>
+    </message>
+    <message name="NoSuchCodeLitFault">
+        <part name="NoSuchCodeLit" type="x1:NoSuchCodeLit"/>
+    </message>
+    <message name="BadRecordLitFault">
+        <part name="BadRecordLit" type="xsd:string"/>
+    </message>
+    
+    <portType name="HelloWorldPortType">
+        <operation name="greetMe">
+            <input message="tns:greetMe" name="greetMe"/>
+            <output message="tns:greetMeResponse" name="greetMeResponse"/>
+        </operation>
+        <operation name="sayHi">
+            <input message="tns:sayHi" name="sayHi"/>
+            <output message="tns:sayHiResponse" name="sayHiResponse"/>
+        </operation>
+        <operation name="greetMeOneWay">
+            <input message="tns:greetMeOneWay" name="greetMeOneWay"/>
+        </operation>
+        <operation name="testRpcLitFault">
+            <input name="testRpcLitFaultRequest" message="tns:testRpcLitFaultRequest"/>
+            <output name="testRpcLitFaultResponse" message="tns:testRpcLitFaultResponse"/>
+            <fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault"/>
+            <fault name="BadRecordLitFault" message="tns:BadRecordLitFault"/>
+        </operation>
+    </portType>
+
+    <binding name="HelloWorldPortBinding" type="tns:HelloWorldPortType">
+        <soap:binding style="rpc" transport="http://cxf.apache.org/transports/jms"/>
+        <operation name="greetMe">
+            <soap:operation soapAction="" style="rpc"/>
+            <input name="greetMe">
+                <soap:body 
+                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
+            </input>
+            <output name="greetMeResponse">
+                <soap:body  
+                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
+            </output>
+        </operation>
+        <operation name="sayHi">
+            <soap:operation soapAction="" style="rpc"/>
+            <input name="sayHi">
+                <soap:body 
+                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
+            </input>
+            <output name="sayHiResponse">
+                <soap:body 
+                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
+            </output>
+        </operation>
+        <operation name="greetMeOneWay">
+            <soap:operation style="rpc"/>
+            <input name="greetMeOneWay">
+                <soap:body 
+                    namespace="http://cxf.apache.org/hello_world_jms" use="literal"/>
+            </input>
+        </operation>
+
+         <operation name="testRpcLitFault">
+            <soap:operation style="rpc"/>
+            <input>
+                <soap:body namespace="http://cxf.apache.org/hello_world_jms"  use="literal"/>
+            </input>
+            <output>
+                <soap:body namespace="http://cxf.apache.org/hello_world_jms"  use="literal"/>
+            </output>
+            <fault name="NoSuchCodeLitFault">
+                <soap:fault name="NoSuchCodeLitFault" use="literal"/>
+            </fault>
+            <fault name="BadRecordLitFault">
+                <soap:fault name="BadRecordLitFault" use="literal"/>
+            </fault>
+        </operation>
+    </binding>
+
+    <service name="HelloWorldService">
+           <port binding="tns:HelloWorldPortBinding" name="HelloWorldPort">
+               <jms:address
+                   jndiConnectionFactoryName="ConnectionFactory" 
+                   jndiDestinationName="dynamicQueues/test.jmstransport.text">
+                   <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+                   <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
+               </jms:address>
+            
+               <jms:server durableSubscriberName="CXF_subscriber"/>
+           </port>
+    </service>
+</definitions>
+
+

Propchange: incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test2.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test2.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/jms_test2.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/soapheader.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/soapheader.wsdl?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/soapheader.wsdl (original)
+++ incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/soapheader.wsdl Fri May 18 09:39:38 2007
@@ -1,98 +1,98 @@
-<?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/header_test" 
-		  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-		  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-		  targetNamespace="http://apache.org/header_test" 
-		  name="TestHeaderWSDL"
-		  xmlns:all="http://apache.org/tests/type_test/all"
-		  xmlns:chc="http://apache.org/tests/type_test/choice"
-		  xmlns:seq="http://apache.org/tests/type_test/sequence">
-    <wsdl:types>
-        <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-            targetNamespace="http://apache.org/tests/type_test/all">
-            <element name="test_all" type="all:SimpleAll"/>
-            <complexType name="SimpleAll">
-                <all>
-                    <element name="varFloat" type="float"/>
-                    <element name="varInt" type="int"/>
-                    <element name="varString" type="string"/>
-                </all>
-                <attribute name="varAttrString" type="string"/>
-            </complexType>
-        </schema>
-        <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-            targetNamespace="http://apache.org/tests/type_test/sequence">
-            <element name="test_seq" type="seq:SimpleStruct"/>
-            <complexType name="SimpleStruct">
-                <sequence>
-                    <element name="varFloat" type="float"/>
-                    <element name="varInt" type="int"/>
-                    <element name="varString" type="string"/>
-                </sequence>
-                <attribute name="varAttrString" type="string"/>
-            </complexType>
-        </schema>
-        <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-            targetNamespace="http://apache.org/tests/type_test/choice">
-            <element name="test_chc" type="chc:SimpleChoice"/>
-            <complexType name="SimpleChoice">
-                <choice>
-                    <element name="varFloat" type="float"/>
-                    <element name="varInt" type="int"/>
-                    <element name="varString" type="string"/>
-                </choice>
-            </complexType>
-        </schema>
-    </wsdl:types>
-    <message name="AnyTypeRequest">
-        <part name="x" element="all:test_all"/>
-        <part name="y" element="chc:test_chc"/>
-    </message>
-    <message name="AnyTypeResponse">
-        <part name="x" element="all:test_all"/>
-        <part name="return" element="seq:test_seq"/>
-    </message>
-    <wsdl:portType name="TestHeader">
-        <operation name="send_receive_any_type">
-            <input name="send_receive_any_type_request" message="tns:AnyTypeRequest"/>
-            <output name="send_receive_any_type_response" message="tns:AnyTypeResponse"/>
-        </operation>
-    </wsdl:portType>
-    <wsdl:binding name="TestHeader_SOAPBinding" type="tns:TestHeader">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="send_receive_any_type">
-            <soap:operation soapAction="" style="document"/>
-            <input>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-    </wsdl:binding>
-    <wsdl:service name="SOAPHeaderService">
-        <wsdl:port name="SoapHeaderPort" binding="tns:TestHeader_SOAPBinding">
-            <soap:address location="http://localhost:9104/SoapHeaderContext/SoapHeaderPort"/>
-        </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 xmlns="http://schemas.xmlsoap.org/wsdl/" 
+		  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+		  xmlns:tns="http://apache.org/header_test" 
+		  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+		  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+		  targetNamespace="http://apache.org/header_test" 
+		  name="TestHeaderWSDL"
+		  xmlns:all="http://apache.org/tests/type_test/all"
+		  xmlns:chc="http://apache.org/tests/type_test/choice"
+		  xmlns:seq="http://apache.org/tests/type_test/sequence">
+    <wsdl:types>
+        <schema xmlns="http://www.w3.org/2001/XMLSchema" 
+            targetNamespace="http://apache.org/tests/type_test/all">
+            <element name="test_all" type="all:SimpleAll"/>
+            <complexType name="SimpleAll">
+                <all>
+                    <element name="varFloat" type="float"/>
+                    <element name="varInt" type="int"/>
+                    <element name="varString" type="string"/>
+                </all>
+                <attribute name="varAttrString" type="string"/>
+            </complexType>
+        </schema>
+        <schema xmlns="http://www.w3.org/2001/XMLSchema" 
+            targetNamespace="http://apache.org/tests/type_test/sequence">
+            <element name="test_seq" type="seq:SimpleStruct"/>
+            <complexType name="SimpleStruct">
+                <sequence>
+                    <element name="varFloat" type="float"/>
+                    <element name="varInt" type="int"/>
+                    <element name="varString" type="string"/>
+                </sequence>
+                <attribute name="varAttrString" type="string"/>
+            </complexType>
+        </schema>
+        <schema xmlns="http://www.w3.org/2001/XMLSchema" 
+            targetNamespace="http://apache.org/tests/type_test/choice">
+            <element name="test_chc" type="chc:SimpleChoice"/>
+            <complexType name="SimpleChoice">
+                <choice>
+                    <element name="varFloat" type="float"/>
+                    <element name="varInt" type="int"/>
+                    <element name="varString" type="string"/>
+                </choice>
+            </complexType>
+        </schema>
+    </wsdl:types>
+    <message name="AnyTypeRequest">
+        <part name="x" element="all:test_all"/>
+        <part name="y" element="chc:test_chc"/>
+    </message>
+    <message name="AnyTypeResponse">
+        <part name="x" element="all:test_all"/>
+        <part name="return" element="seq:test_seq"/>
+    </message>
+    <wsdl:portType name="TestHeader">
+        <operation name="send_receive_any_type">
+            <input name="send_receive_any_type_request" message="tns:AnyTypeRequest"/>
+            <output name="send_receive_any_type_response" message="tns:AnyTypeResponse"/>
+        </operation>
+    </wsdl:portType>
+    <wsdl:binding name="TestHeader_SOAPBinding" type="tns:TestHeader">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="send_receive_any_type">
+            <soap:operation soapAction="" style="document"/>
+            <input>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+    </wsdl:binding>
+    <wsdl:service name="SOAPHeaderService">
+        <wsdl:port name="SoapHeaderPort" binding="tns:TestHeader_SOAPBinding">
+            <soap:address location="http://localhost:9104/SoapHeaderContext/SoapHeaderPort"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>

Propchange: incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/soapheader.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/soapheader.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/soapheader.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java?view=diff&rev=539517&r1=539516&r2=539517
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java Fri May 18 09:39:38 2007
@@ -1,54 +1,54 @@
-/**
- * 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.wsdlto;
-
-import java.net.URISyntaxException;
-
-import junit.framework.TestCase;
-import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.tools.common.ToolConstants;
-import org.apache.cxf.tools.common.ToolContext;
-import org.apache.cxf.tools.common.ToolException;
-
-public class WSDLToJavaContainerTest extends TestCase {
-    public void testNoPlugin() throws Exception {
-        WSDLToJavaContainer container = new WSDLToJavaContainer("dummy", null);
-
-        ToolContext context = new ToolContext();
-        context.put(ToolConstants.CFG_WSDLURL, getLocation("hello_world.wsdl"));
-        container.setContext(context);
-        
-        try {
-            container.execute();
-        } catch (ToolException te) {
-            assertEquals(getLogMessage("FOUND_NO_FRONTEND"), te.getMessage());
-        } catch (Exception e) {
-            fail("Should not throw any exception but ToolException.");
-        }
-    }
-
-    private String getLocation(String wsdlFile) throws URISyntaxException {
-        return this.getClass().getResource(wsdlFile).toURI().getPath();
-    }
-
-    protected String getLogMessage(String key, Object...params) {
-        return new Message(key, WSDLToJavaContainer.LOG, params).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.wsdlto;
+
+import java.net.URISyntaxException;
+
+import junit.framework.TestCase;
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.tools.common.ToolConstants;
+import org.apache.cxf.tools.common.ToolContext;
+import org.apache.cxf.tools.common.ToolException;
+
+public class WSDLToJavaContainerTest extends TestCase {
+    public void testNoPlugin() throws Exception {
+        WSDLToJavaContainer container = new WSDLToJavaContainer("dummy", null);
+
+        ToolContext context = new ToolContext();
+        context.put(ToolConstants.CFG_WSDLURL, getLocation("hello_world.wsdl"));
+        container.setContext(context);
+        
+        try {
+            container.execute();
+        } catch (ToolException te) {
+            assertEquals(getLogMessage("FOUND_NO_FRONTEND"), te.getMessage());
+        } catch (Exception e) {
+            fail("Should not throw any exception but ToolException.");
+        }
+    }
+
+    private String getLocation(String wsdlFile) throws URISyntaxException {
+        return this.getClass().getResource(wsdlFile).toURI().getPath();
+    }
+
+    protected String getLogMessage(String key, Object...params) {
+        return new Message(key, WSDLToJavaContainer.LOG, params).toString();
+    }
+}

Propchange: incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date