cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r547040 [2/6] - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/phase/ api/src/main/java/org/apache/cxf/service/ api/src/main/java/org/apache/cxf/tools/validator/ api/src/main/java/org/apache/cxf/wsdl/ common/common/src/main/java/...
Date Wed, 13 Jun 2007 21:45:33 GMT
Modified: incubator/cxf/trunk/testutils/src/main/resources/wsdl/swa-mime-binding.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/swa-mime-binding.xml?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/swa-mime-binding.xml (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/swa-mime-binding.xml Wed Jun 13 14:45:28 2007
@@ -1,27 +1,27 @@
-<!--
-  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.
--->
-<bindings
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    wsdlLocation="swa-mime.wsdl"
-    xmlns="http://java.sun.com/xml/ns/jaxws">
-    <bindings node="wsdl:definitions">
-	<enableMIMEContent>true</enableMIMEContent>
-    </bindings>
+<!--
+  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.
+-->
+<bindings
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    wsdlLocation="swa-mime.wsdl"
+    xmlns="http://java.sun.com/xml/ns/jaxws">
+    <bindings node="wsdl:definitions">
+	<enableMIMEContent>true</enableMIMEContent>
+    </bindings>
 </bindings>

Propchange: incubator/cxf/trunk/testutils/src/main/resources/wsdl/swa-mime-binding.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/testutils/src/main/resources/wsdl/swa-mime-binding.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/testutils/src/main/resources/wsdl/swa-mime-binding.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd (original)
+++ incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd Wed Jun 13 14:45:28 2007
@@ -1,39 +1,39 @@
-<?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.
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jbi="http://cxf.apache.org/bindings/jbi"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-  targetNamespace="http://cxf.apache.org/bindings/jbi"
-  elementFormDefault="qualified"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0">
-  
-  <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" schemaLocation="http://schemas.xmlsoap.org/wsdl/" />
-  
-  <xs:complexType name="JBIFormatBinding">
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibilityElement">
-        <xs:sequence />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:element name="binding" type="jbi:JBIFormatBinding"/>
-  
-</xs:schema>
+<?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.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:jbi="http://cxf.apache.org/bindings/jbi"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  targetNamespace="http://cxf.apache.org/bindings/jbi"
+  elementFormDefault="qualified"
+  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0">
+  
+  <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" schemaLocation="http://schemas.xmlsoap.org/wsdl/" />
+  
+  <xs:complexType name="JBIFormatBinding">
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement">
+        <xs:sequence />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:element name="binding" type="jbi:JBIFormatBinding"/>
+  
+</xs:schema>

Propchange: incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/javato/test/src/test/generated/HelloNoPackage.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/generated/HelloNoPackage.java?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/generated/HelloNoPackage.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/generated/HelloNoPackage.java Wed Jun 13 14:45:28 2007
@@ -1,21 +1,21 @@
-/**
- * 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.
- */
-public interface HelloNoPackage {
-    String sayHi(String arg);
-}
+/**
+ * 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.
+ */
+public interface HelloNoPackage {
+    String sayHi(String arg);
+}

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/generated/HelloNoPackage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/generated/HelloNoPackage.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/Hello.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/Hello.java?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/Hello.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/Hello.java Wed Jun 13 14:45:28 2007
@@ -1,25 +1,25 @@
-/**
- * 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.fortest;
-
-public interface Hello {
-    String sayHi(String arg);
-}
-
-
+/**
+ * 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.fortest;
+
+public interface Hello {
+    String sayHi(String arg);
+}
+
+

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/Hello.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/Hello.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/RPCHello.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/RPCHello.java?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/RPCHello.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/RPCHello.java Wed Jun 13 14:45:28 2007
@@ -1,30 +1,30 @@
-/**
- * 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.fortest;
-
-import javax.jws.soap.SOAPBinding;
-
-@javax.jws.WebService(targetNamespace = "http://cxf.apache.org/rpc")
-@javax.jws.soap.SOAPBinding(style = SOAPBinding.Style.RPC, 
-                            use = SOAPBinding.Use.LITERAL, 
-                            parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
-public interface RPCHello {
-    String hello(String str);
-
-}
+/**
+ * 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.fortest;
+
+import javax.jws.soap.SOAPBinding;
+
+@javax.jws.WebService(targetNamespace = "http://cxf.apache.org/rpc")
+@javax.jws.soap.SOAPBinding(style = SOAPBinding.Style.RPC, 
+                            use = SOAPBinding.Use.LITERAL, 
+                            parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+public interface RPCHello {
+    String hello(String str);
+
+}

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/RPCHello.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/RPCHello.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/Hello.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/Hello.java?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/Hello.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/Hello.java Wed Jun 13 14:45:28 2007
@@ -1,39 +1,39 @@
-/**
- * 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.fortest.cxf669;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-@WebService(targetNamespace = "http://foo.com/HelloWorld", name = "HelloWorld")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-public interface Hello {
-
-    @WebResult(partName = "out", name = "out")
-    @WebMethod
-    String echoFoo(@WebParam(partName = "in", name = "in") String s);
-
-    @WebResult
-    @WebMethod
-    SayHiResponse sayHi(SayHi s);
-} 
+/**
+ * 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.fortest.cxf669;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(targetNamespace = "http://foo.com/HelloWorld", name = "HelloWorld")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface Hello {
+
+    @WebResult(partName = "out", name = "out")
+    @WebMethod
+    String echoFoo(@WebParam(partName = "in", name = "in") String s);
+
+    @WebResult
+    @WebMethod
+    SayHiResponse sayHi(SayHi s);
+} 

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/Hello.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/Hello.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/HelloImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/HelloImpl.java?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/HelloImpl.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/HelloImpl.java Wed Jun 13 14:45:28 2007
@@ -1,35 +1,35 @@
-/**
- * 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.fortest.cxf669;
-
-import javax.jws.WebService;
-
-@WebService(serviceName = "HelloService",
-            portName = "HelloPort",
-            endpointInterface = "org.apache.cxf.tools.fortest.cxf669.Hello",
-            targetNamespace = "http://foo.com/HelloWorldService")
-public class HelloImpl {
-    public String echoFoo(String s) {
-        return s;
-    }
-
-    public SayHiResponse sayHi(SayHi s) {
-        return new SayHiResponse();
-    }
-}
+/**
+ * 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.fortest.cxf669;
+
+import javax.jws.WebService;
+
+@WebService(serviceName = "HelloService",
+            portName = "HelloPort",
+            endpointInterface = "org.apache.cxf.tools.fortest.cxf669.Hello",
+            targetNamespace = "http://foo.com/HelloWorldService")
+public class HelloImpl {
+    public String echoFoo(String s) {
+        return s;
+    }
+
+    public SayHiResponse sayHi(SayHi s) {
+        return new SayHiResponse();
+    }
+}

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/HelloImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/HelloImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/SayHi.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/SayHi.java?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/SayHi.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/SayHi.java Wed Jun 13 14:45:28 2007
@@ -1,45 +1,45 @@
-/**
- * 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.fortest.cxf669;
-
-public class SayHi {
-
-    /**
-     * Describe msg here.
-     */
-    private String msg;
-
-    /**
-     * Get the <code>Msg</code> value.
-     *
-     * @return a <code>String</code> value
-     */
-    public final String getMsg() {
-        return msg;
-    }
-
-    /**
-     * Set the <code>Msg</code> value.
-     *
-     * @param newMsg The new Msg value.
-     */
-    public final void setMsg(final String newMsg) {
-        this.msg = newMsg;
-    }
-}
+/**
+ * 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.fortest.cxf669;
+
+public class SayHi {
+
+    /**
+     * Describe msg here.
+     */
+    private String msg;
+
+    /**
+     * Get the <code>Msg</code> value.
+     *
+     * @return a <code>String</code> value
+     */
+    public final String getMsg() {
+        return msg;
+    }
+
+    /**
+     * Set the <code>Msg</code> value.
+     *
+     * @param newMsg The new Msg value.
+     */
+    public final void setMsg(final String newMsg) {
+        this.msg = newMsg;
+    }
+}

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/SayHi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/SayHi.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/SayHiResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/SayHiResponse.java?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/SayHiResponse.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/SayHiResponse.java Wed Jun 13 14:45:28 2007
@@ -1,45 +1,45 @@
-/**
- * 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.fortest.cxf669;
-
-public class SayHiResponse {
-
-    /**
-     * Describe msg here.
-     */
-    private String msg;
-
-    /**
-     * Get the <code>Msg</code> value.
-     *
-     * @return a <code>String</code> value
-     */
-    public final String getMsg() {
-        return msg;
-    }
-
-    /**
-     * Set the <code>Msg</code> value.
-     *
-     * @param newMsg The new Msg value.
-     */
-    public final void setMsg(final String newMsg) {
-        this.msg = newMsg;
-    }
-}
+/**
+ * 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.fortest.cxf669;
+
+public class SayHiResponse {
+
+    /**
+     * Describe msg here.
+     */
+    private String msg;
+
+    /**
+     * Get the <code>Msg</code> value.
+     *
+     * @return a <code>String</code> value
+     */
+    public final String getMsg() {
+        return msg;
+    }
+
+    /**
+     * Set the <code>Msg</code> value.
+     *
+     * @param newMsg The new Msg value.
+     */
+    public final void setMsg(final String newMsg) {
+        this.msg = newMsg;
+    }
+}

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/SayHiResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf669/SayHiResponse.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidationResult.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidationResult.java?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidationResult.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidationResult.java Wed Jun 13 14:45:28 2007
@@ -1,85 +1,85 @@
-/**
- * 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.validator.internal;
-
-import java.util.Stack;
-import org.apache.cxf.common.i18n.Message;
-
-public final class ValidationResult {
-
-    private Stack<String> errors = new Stack<String>();
-    private Stack<String> warnings = new Stack<String>();
-
-    public Stack<String> getErrors() {
-        return this.errors;
-    }
-
-    public Stack<String> getWarnings() {
-        return this.warnings;
-    }
-
-    public void addError(final Message msg) {
-        addError(msg.toString());
-    }
-    
-    public void addError(final String error) {
-        this.errors.push(error);
-    }
-
-    public void addWarning(final Message msg) {
-        addWarning(msg.toString());
-    }
-
-    public void addWarning(final String warning) {
-        this.warnings.push(warning);
-    }
-
-    public boolean hasWarnings() {
-        return warnings.size() > 0;
-    }
-    
-    public boolean isSuccessful() {
-        return errors.size() == 0 && warnings.size() == 0;
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append("\n Summary: ");
-        sb.append(" Failures: ");
-        sb.append(errors.size());
-        sb.append(", Warnings: ");
-        sb.append(warnings.size());
-        if (errors.size() > 0) {
-            sb.append("\n\n <<< ERROR! \n");
-            while (!errors.empty()) {
-                sb.append(errors.pop());
-                sb.append("\n");
-            }
-        }
-        if (warnings.size() > 0) {
-            sb.append("\n <<< WARNING! \n");
-            while (!warnings.empty()) {
-                sb.append(warnings.pop());
-                sb.append("\n");                    
-            }
-        }
-        return sb.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.validator.internal;
+
+import java.util.Stack;
+import org.apache.cxf.common.i18n.Message;
+
+public final class ValidationResult {
+
+    private Stack<String> errors = new Stack<String>();
+    private Stack<String> warnings = new Stack<String>();
+
+    public Stack<String> getErrors() {
+        return this.errors;
+    }
+
+    public Stack<String> getWarnings() {
+        return this.warnings;
+    }
+
+    public void addError(final Message msg) {
+        addError(msg.toString());
+    }
+    
+    public void addError(final String error) {
+        this.errors.push(error);
+    }
+
+    public void addWarning(final Message msg) {
+        addWarning(msg.toString());
+    }
+
+    public void addWarning(final String warning) {
+        this.warnings.push(warning);
+    }
+
+    public boolean hasWarnings() {
+        return warnings.size() > 0;
+    }
+    
+    public boolean isSuccessful() {
+        return errors.size() == 0 && warnings.size() == 0;
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("\n Summary: ");
+        sb.append(" Failures: ");
+        sb.append(errors.size());
+        sb.append(", Warnings: ");
+        sb.append(warnings.size());
+        if (errors.size() > 0) {
+            sb.append("\n\n <<< ERROR! \n");
+            while (!errors.empty()) {
+                sb.append(errors.pop());
+                sb.append("\n");
+            }
+        }
+        if (warnings.size() > 0) {
+            sb.append("\n <<< WARNING! \n");
+            while (!warnings.empty()) {
+                sb.append(warnings.pop());
+                sb.append("\n");                    
+            }
+        }
+        return sb.toString();
+    }    
+}

Propchange: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidationResult.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidationResult.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java Wed Jun 13 14:45:28 2007
@@ -1,533 +1,533 @@
-/**
- * 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.validator.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Logger;
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.xpath.XPathConstants;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.helpers.XPathUtils;
-import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.util.URIParserUtil;
-import org.apache.cxf.tools.validator.internal.model.FailureLocation;
-import org.apache.cxf.tools.validator.internal.model.XBinding;
-import org.apache.cxf.tools.validator.internal.model.XDef;
-import org.apache.cxf.tools.validator.internal.model.XFault;
-import org.apache.cxf.tools.validator.internal.model.XInput;
-import org.apache.cxf.tools.validator.internal.model.XMessage;
-import org.apache.cxf.tools.validator.internal.model.XNode;
-import org.apache.cxf.tools.validator.internal.model.XOperation;
-import org.apache.cxf.tools.validator.internal.model.XOutput;
-import org.apache.cxf.tools.validator.internal.model.XPort;
-import org.apache.cxf.tools.validator.internal.model.XPortType;
-import org.apache.cxf.tools.validator.internal.model.XService;
-import org.apache.cxf.wsdl.WSDLConstants;
-import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaType;
-
-public class WSDLRefValidator extends AbstractDefinitionValidator {
-    protected static final Logger LOG = LogUtils.getL7dLogger(WSDLRefValidator.class);
-    protected List<XNode> vNodes = new ArrayList<XNode>();
-    
-    private Set<QName> portTypeRefNames = new HashSet<QName>();
-    private Set<QName> messageRefNames = new HashSet<QName>();
-
-    private ValidationResult vResults = new ValidationResult();
-
-    private Definition definition;
-
-    private List<Definition> importedDefinitions;
-    private List<XmlSchemaCollection> schemas;
-    private XmlSchemaCollection schemaCollection = new XmlSchemaCollection();
-
-    private boolean suppressWarnings;
-
-    public WSDLRefValidator() {
-    }
-
-    public WSDLRefValidator(final String wsdl) {
-        this(wsdl, null);
-    }
-    
-    public WSDLRefValidator(final String wsdl, final Document doc) {
-        WSDLDefinitionBuilder wsdlBuilder = new WSDLDefinitionBuilder();
-        try {
-            this.definition = wsdlBuilder.build(wsdl);
-
-            if (wsdlBuilder.getImportedDefinitions().size() > 0) {
-                importedDefinitions = new ArrayList<Definition>();
-                importedDefinitions.addAll(wsdlBuilder.getImportedDefinitions());
-            }
-        } catch (Exception e) {
-            if (e.getCause() instanceof WSDLException) {
-                throw new ToolException(e.getCause().getMessage());
-            }
-            throw new ToolException(e);
-        }
-
-        try {
-            Document document = doc == null ? getWSDLDocument() : doc;
-            schemas = ValidatorUtil.getSchemaList(document, definition.getDocumentBaseURI());
-        } catch (IOException ex) {
-            throw new ToolException("Cannot get schema list " + definition.getDocumentBaseURI(), ex);
-        } catch (Exception ex) {
-            throw new ToolException(ex);
-        }
-    }
-
-    public void setSuppressWarnings(boolean s) {
-        this.suppressWarnings = s;
-    }
-
-    public ValidationResult getValidationResults() {
-        return this.vResults;
-    }
-
-    private File getWSDLFile(String location) throws URISyntaxException {
-        return new File(new URI(URIParserUtil.getAbsoluteURI(location)));
-    }
-
-    private Document getWSDLDocument(final String wsdl) throws URISyntaxException {
-        return new Stax2DOM().getDocument(getWSDLFile(wsdl));
-    }
-    
-    private Document getWSDLDocument() throws Exception {
-        return getWSDLDocument(this.definition.getDocumentBaseURI());
-    }
-    
-    private List<Document> getWSDLDocuments() {
-        List<Document> docs = new ArrayList<Document>();
-        try {
-            docs.add(getWSDLDocument());
-
-            if (null != importedDefinitions) {
-                for (Definition d : importedDefinitions) {
-                    docs.add(getWSDLDocument(d.getDocumentBaseURI()));
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            // ignore
-        }
-        
-        return docs;
-    }
-
-    private boolean isExist(List<Document> docs, XNode vNode) {
-        XPathUtils xpather = new XPathUtils(vNode.getNSMap());
-        String expression = vNode.toString();
-        for (Document doc : docs) {
-            if (xpather.isExist(expression, doc, XPathConstants.NODE)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private FailureLocation getFailureLocation(List<Document> docs, XNode fNode) {
-        if (fNode == null) {
-            return null;
-        }
-
-        XPathUtils xpather = new XPathUtils(fNode.getNSMap());
-        for (Document doc : docs) {
-            Node node = (Node) xpather.getValue(fNode.toString(), doc, XPathConstants.NODE);
-            if (null != node) {
-                return new FailureLocation((Location)node.getUserData(WSDLConstants.NODE_LOCATION),
-                                           doc.getDocumentURI());
-            }
-        }
-        return null;
-    }
-    
-    public boolean isValid() {
-        try {
-
-            collectValidationPoints();
-            
-            List<Document> wsdlDocs = getWSDLDocuments();
-            for (XNode vNode : vNodes) {
-
-                if (!isExist(wsdlDocs, vNode)) {
-                    FailureLocation loc = getFailureLocation(wsdlDocs, vNode.getFailurePoint());
-                    vResults.addError(new Message("FAILED_AT_POINT",
-                                                  LOG,
-                                                  loc.getLocation().getLineNumber(),
-                                                  loc.getLocation().getColumnNumber(),
-                                                  loc.getDocumentURI(),
-                                                  vNode.getPlainText()));
-                }
-            }
-        } catch (ToolException e) {
-            this.vResults.addError(e.getMessage());
-            return false;
-        }
-        return vResults.isSuccessful();
-    }
-
-    public void setDefinition(final Definition def) {
-        this.definition = def;
-    }
-
-    private Map<QName, Service> getServices() {
-        Map<QName, Service> services = new HashMap<QName, Service>();
-        Iterator sNames = definition.getAllServices().keySet().iterator();
-        while (sNames.hasNext()) {
-            QName sName = (QName) sNames.next();
-            services.put(sName, definition.getService(sName));
-        }
-        return services;
-    }
-
-    private Map<QName, XNode> getBindings(Service service) {
-        Map<QName, XNode> bindings = new HashMap<QName, XNode>();
-
-        if (service.getPorts().values().size() == 0) {
-            throw new ToolException("Service " + service.getQName() + " does not contain any usable ports");
-        }
-        Iterator portIte = service.getPorts().values().iterator();
-        while (portIte.hasNext()) {
-            Port port = (Port)portIte.next();
-            Binding binding = port.getBinding();
-            bindings.put(binding.getQName(), getXNode(service, port));
-            if (WSDLConstants.WSDL11_NAMESPACE.equals(binding.getQName().getNamespaceURI())) {
-                throw new ToolException("Binding "
-                                        + binding.getQName().getLocalPart()
-                                        + " namespace set improperly.");
-            }
-        }
-
-        return bindings;
-    }
-
-    private Map<QName, Operation> getOperations(PortType portType) {
-        Map<QName, Operation> operations = new HashMap<QName, Operation>();
-        for (Iterator iter = portType.getOperations().iterator(); iter.hasNext();) {
-            Operation op = (Operation) iter.next();
-            operations.put(new QName(portType.getQName().getNamespaceURI(), op.getName()), op);
-        }
-        return operations;
-    }
-
-    private XNode getXNode(Service service, Port port) {
-        XNode vService = getXNode(service);
-
-        XPort pNode = new XPort();
-        pNode.setName(port.getName());
-        pNode.setParentNode(vService);
-        return pNode;
-    }
-    
-    private XNode getXNode(Service service) {
-        XDef xdef = new XDef();
-        xdef.setTargetNamespace(service.getQName().getNamespaceURI());
-
-        XService sNode = new XService();
-        sNode.setName(service.getQName().getLocalPart());
-        sNode.setParentNode(xdef);
-        return sNode;
-    }
-    
-    private XNode getXNode(Binding binding) {
-        XDef xdef = new XDef();
-        xdef.setTargetNamespace(binding.getQName().getNamespaceURI());
-
-        XBinding bNode = new XBinding();
-        bNode.setName(binding.getQName().getLocalPart());
-        bNode.setParentNode(xdef);
-        return bNode;
-    }
-
-    private XNode getXNode(PortType portType) {
-        XDef xdef = new XDef();
-        xdef.setTargetNamespace(portType.getQName().getNamespaceURI());
-
-        XPortType pNode = new XPortType();
-        pNode.setName(portType.getQName().getLocalPart());
-        pNode.setParentNode(xdef);
-        return pNode;
-    }
-
-    private XNode getOperationXNode(XNode pNode, String opName) {
-        XOperation node = new XOperation();
-        node.setName(opName);
-        node.setParentNode(pNode);
-        return node;
-    }
-
-    private XNode getInputXNode(XNode opVNode, String name) {
-        XInput oNode = new XInput();
-        oNode.setName(name);
-        oNode.setParentNode(opVNode);
-        return oNode;
-    }
-
-    private XNode getOutputXNode(XNode opVNode, String name) {
-        XOutput oNode = new XOutput();
-        oNode.setName(name);
-        oNode.setParentNode(opVNode);
-        return oNode;
-    }
-
-    private XNode getFaultXNode(XNode opVNode, String name) {
-        XFault oNode = new XFault();
-        oNode.setName(name);
-        oNode.setParentNode(opVNode);
-        return oNode;
-    }
-
-    private XNode getXNode(javax.wsdl.Message msg) {
-        XDef xdef = new XDef();
-        xdef.setTargetNamespace(msg.getQName().getNamespaceURI());
-
-        XMessage mNode = new XMessage();
-        mNode.setName(msg.getQName().getLocalPart());
-        mNode.setParentNode(xdef);
-        return mNode;
-    }
-
-    private void addWarning(String warningMsg) {
-        if (suppressWarnings) {
-            return;
-        }
-        vResults.addWarning(warningMsg);
-    }
-    
-    @SuppressWarnings("unchecked")
-    private void collectValidationPoints() {
-        if (getServices().size() == 0) {
-            addWarning("WSDL document does not define any services");
-            portTypeRefNames.addAll(this.definition.getAllPortTypes().keySet());
-        } else {
-            collectValidationPointsForBindings();
-        }
-
-        collectValidationPointsForPortTypes();
-        collectValidationPointsForMessages();
-    }
-
-    private void collectValidationPointsForBindings() {
-        Map<QName, XNode> vBindingNodes = new HashMap<QName, XNode>();
-        for (Service service : getServices().values()) {
-            vBindingNodes.putAll(getBindings(service));
-        }
-        
-        for (QName bName : vBindingNodes.keySet()) {
-            Binding binding = this.definition.getBinding(bName);
-            XNode vBindingNode = getXNode(binding);
-            vBindingNode.setFailurePoint(vBindingNodes.get(bName));
-            vNodes.add(vBindingNode);
-
-            if (binding.getPortType() == null) {
-                continue;
-            }
-            portTypeRefNames.add(binding.getPortType().getQName());
-
-            XNode vPortTypeNode = getXNode(binding.getPortType());
-            vPortTypeNode.setFailurePoint(vBindingNode);
-            vNodes.add(vPortTypeNode);
-            for (Iterator iter = binding.getBindingOperations().iterator(); iter.hasNext();) {
-                BindingOperation bop = (BindingOperation) iter.next();
-                XNode vOpNode = getOperationXNode(vPortTypeNode, bop.getName());
-                XNode vBopNode = getOperationXNode(vBindingNode, bop.getName());
-                vOpNode.setFailurePoint(vBopNode);
-                vNodes.add(vOpNode);
-                String inName = bop.getBindingInput().getName();
-                if (!StringUtils.isEmpty(inName)) {
-                    XNode vInputNode = getInputXNode(vOpNode, inName);
-                    vInputNode.setFailurePoint(getInputXNode(vBopNode, inName));
-                    vNodes.add(vInputNode);
-                }
-                if (bop.getBindingOutput() != null) {
-                    String outName = bop.getBindingOutput().getName();
-                    if (!StringUtils.isEmpty(outName)) {
-                        XNode vOutputNode = getOutputXNode(vOpNode, outName);
-                        vOutputNode.setFailurePoint(getOutputXNode(vBopNode, outName));
-                        vNodes.add(vOutputNode);
-                    }
-                }
-                for (Iterator iter1 = bop.getBindingFaults().keySet().iterator(); iter1.hasNext();) {
-                    String faultName = (String) iter1.next();
-                    XNode vFaultNode = getFaultXNode(vOpNode, faultName);
-                    vFaultNode.setFailurePoint(getFaultXNode(vBopNode, faultName));
-                    vNodes.add(vFaultNode);
-                }
-            }
-        }
-    }
-
-    private void collectValidationPointsForMessages() {
-        for (QName msgName : messageRefNames) {
-            javax.wsdl.Message message = this.definition.getMessage(msgName);
-            for (Iterator iter = message.getParts().values().iterator(); iter.hasNext();) {
-                Part part = (Part) iter.next();
-                QName elementName = part.getElementName();
-                QName typeName = part.getTypeName();
-
-                if (elementName == null && typeName == null) {
-                    vResults.addError(new Message("PART_NO_TYPES", LOG));
-                    continue;
-                }
-
-                if (elementName != null && typeName != null) {
-                    vResults.addError(new Message("PART_NOT_UNIQUE", LOG));
-                    continue;
-                }
-
-                if (elementName != null && typeName == null) {
-                    boolean valid = validatePartType(elementName.getNamespaceURI(),
-                                                     elementName.getLocalPart(), true);
-                    if (!valid) {
-                        vResults.addError(new Message("TYPE_REF_NOT_FOUND", LOG, message.getQName(),
-                                                      part.getName(), elementName));
-                    }
-
-                }
-                if (typeName != null && elementName == null) {
-                    boolean valid = validatePartType(typeName.getNamespaceURI(),
-                                                     typeName.getLocalPart(),
-                                                     false);
-                    if (!valid) {
-                        vResults.addError(new Message("TYPE_REF_NOT_FOUND", LOG, message.getQName(),
-                                                      part.getName(), typeName));
-                    }
-                }
-            }
-        }
-    }
-
-    private void collectValidationPointsForPortTypes() {
-        for (QName ptName : portTypeRefNames) {
-            PortType portType = this.definition.getPortType(ptName);
-            XNode vPortTypeNode = getXNode(portType);
-            for (Operation operation : getOperations(portType).values()) {
-                XNode vOperationNode = getOperationXNode(vPortTypeNode, operation.getName());
-                javax.wsdl.Message inMsg = operation.getInput().getMessage();
-                if (inMsg == null) {
-                    addWarning("Operation " + operation.getName() + " in PortType: "
-                               + portType.getQName() + " has no input message");
-                } else {
-                    XNode vInMsgNode = getXNode(inMsg);
-                    vInMsgNode.setFailurePoint(getInputXNode(vOperationNode, operation.getInput().getName()));
-                    vNodes.add(vInMsgNode);
-                    messageRefNames.add(inMsg.getQName());
-                }
-
-                if (operation.getOutput() != null) {
-                    javax.wsdl.Message outMsg = operation.getOutput().getMessage();
-
-                    if (outMsg == null) {
-                        addWarning("Operation " + operation.getName() + " in PortType: "
-                                   + portType.getQName() + " has no output message");
-                    } else {
-                        XNode vOutMsgNode = getXNode(outMsg);
-                        vOutMsgNode.setFailurePoint(getOutputXNode(vOperationNode,
-                                                                   operation.getOutput().getName()));
-                        vNodes.add(vOutMsgNode);
-                        messageRefNames.add(outMsg.getQName());
-                    }
-                }
-                for (Iterator iter = operation.getFaults().values().iterator(); iter.hasNext();) {
-                    Fault fault = (Fault) iter.next();
-                    javax.wsdl.Message faultMsg = fault.getMessage();
-                    XNode vFaultMsgNode = getXNode(faultMsg);
-                    vFaultMsgNode.setFailurePoint(getFaultXNode(vOperationNode, fault.getName()));
-                    vNodes.add(vFaultMsgNode);
-                    messageRefNames.add(faultMsg.getQName());
-                }
-            }
-        }
-    }
-
-    private boolean validatePartType(String namespace, String name, boolean isElement) {
-
-        boolean partvalid = false;
-
-        if (namespace.equals(WSDLConstants.NU_SCHEMA_XSD)) {
-            if (isElement) {
-                XmlSchemaElement  schemaEle = 
-                    schemaCollection.getElementByQName(new QName(WSDLConstants.NU_SCHEMA_XSD, name));    
-                partvalid = schemaEle != null ? true : false;
-            } else {
-                XmlSchemaType schemaType = 
-                    schemaCollection.getTypeByQName(new QName(WSDLConstants.NU_SCHEMA_XSD, name));  
-                partvalid = schemaType != null ? true : false;
-            }
-            
-        } else {
-            if (isElement) {
-                for (XmlSchemaCollection schema : schemas) {
-                    if (schema != null && schema.getElementByQName(
-                            new QName(namespace, name)) != null) {
-                        partvalid = true;
-                        break;
-                    }
-                }
-            } else {
-                for (XmlSchemaCollection schema : schemas) {
-                    if (schema != null && schema.getTypeByQName(
-                            new QName(namespace, name)) != null) {
-                        partvalid = true;
-                        break;
-                    }
-                }
-            }
-        }
-        return partvalid;
-    }
-
-    public String getErrorMessage() {
-        return vResults.toString();
-    }
-
-    public Definition getDefinition() {
-        return this.definition;
-    }
-}
+/**
+ * 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.validator.internal;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+import javax.wsdl.Binding;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
+import javax.wsdl.Operation;
+import javax.wsdl.Part;
+import javax.wsdl.Port;
+import javax.wsdl.PortType;
+import javax.wsdl.Service;
+import javax.wsdl.WSDLException;
+import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
+import javax.xml.xpath.XPathConstants;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.helpers.XPathUtils;
+import org.apache.cxf.tools.common.ToolException;
+import org.apache.cxf.tools.util.URIParserUtil;
+import org.apache.cxf.tools.validator.internal.model.FailureLocation;
+import org.apache.cxf.tools.validator.internal.model.XBinding;
+import org.apache.cxf.tools.validator.internal.model.XDef;
+import org.apache.cxf.tools.validator.internal.model.XFault;
+import org.apache.cxf.tools.validator.internal.model.XInput;
+import org.apache.cxf.tools.validator.internal.model.XMessage;
+import org.apache.cxf.tools.validator.internal.model.XNode;
+import org.apache.cxf.tools.validator.internal.model.XOperation;
+import org.apache.cxf.tools.validator.internal.model.XOutput;
+import org.apache.cxf.tools.validator.internal.model.XPort;
+import org.apache.cxf.tools.validator.internal.model.XPortType;
+import org.apache.cxf.tools.validator.internal.model.XService;
+import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaType;
+
+public class WSDLRefValidator extends AbstractDefinitionValidator {
+    protected static final Logger LOG = LogUtils.getL7dLogger(WSDLRefValidator.class);
+    protected List<XNode> vNodes = new ArrayList<XNode>();
+    
+    private Set<QName> portTypeRefNames = new HashSet<QName>();
+    private Set<QName> messageRefNames = new HashSet<QName>();
+
+    private ValidationResult vResults = new ValidationResult();
+
+    private Definition definition;
+
+    private List<Definition> importedDefinitions;
+    private List<XmlSchemaCollection> schemas;
+    private XmlSchemaCollection schemaCollection = new XmlSchemaCollection();
+
+    private boolean suppressWarnings;
+
+    public WSDLRefValidator() {
+    }
+
+    public WSDLRefValidator(final String wsdl) {
+        this(wsdl, null);
+    }
+    
+    public WSDLRefValidator(final String wsdl, final Document doc) {
+        WSDLDefinitionBuilder wsdlBuilder = new WSDLDefinitionBuilder();
+        try {
+            this.definition = wsdlBuilder.build(wsdl);
+
+            if (wsdlBuilder.getImportedDefinitions().size() > 0) {
+                importedDefinitions = new ArrayList<Definition>();
+                importedDefinitions.addAll(wsdlBuilder.getImportedDefinitions());
+            }
+        } catch (Exception e) {
+            if (e.getCause() instanceof WSDLException) {
+                throw new ToolException(e.getCause().getMessage());
+            }
+            throw new ToolException(e);
+        }
+
+        try {
+            Document document = doc == null ? getWSDLDocument() : doc;
+            schemas = ValidatorUtil.getSchemaList(document, definition.getDocumentBaseURI());
+        } catch (IOException ex) {
+            throw new ToolException("Cannot get schema list " + definition.getDocumentBaseURI(), ex);
+        } catch (Exception ex) {
+            throw new ToolException(ex);
+        }
+    }
+
+    public void setSuppressWarnings(boolean s) {
+        this.suppressWarnings = s;
+    }
+
+    public ValidationResult getValidationResults() {
+        return this.vResults;
+    }
+
+    private File getWSDLFile(String location) throws URISyntaxException {
+        return new File(new URI(URIParserUtil.getAbsoluteURI(location)));
+    }
+
+    private Document getWSDLDocument(final String wsdl) throws URISyntaxException {
+        return new Stax2DOM().getDocument(getWSDLFile(wsdl));
+    }
+    
+    private Document getWSDLDocument() throws Exception {
+        return getWSDLDocument(this.definition.getDocumentBaseURI());
+    }
+    
+    private List<Document> getWSDLDocuments() {
+        List<Document> docs = new ArrayList<Document>();
+        try {
+            docs.add(getWSDLDocument());
+
+            if (null != importedDefinitions) {
+                for (Definition d : importedDefinitions) {
+                    docs.add(getWSDLDocument(d.getDocumentBaseURI()));
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            // ignore
+        }
+        
+        return docs;
+    }
+
+    private boolean isExist(List<Document> docs, XNode vNode) {
+        XPathUtils xpather = new XPathUtils(vNode.getNSMap());
+        String expression = vNode.toString();
+        for (Document doc : docs) {
+            if (xpather.isExist(expression, doc, XPathConstants.NODE)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private FailureLocation getFailureLocation(List<Document> docs, XNode fNode) {
+        if (fNode == null) {
+            return null;
+        }
+
+        XPathUtils xpather = new XPathUtils(fNode.getNSMap());
+        for (Document doc : docs) {
+            Node node = (Node) xpather.getValue(fNode.toString(), doc, XPathConstants.NODE);
+            if (null != node) {
+                return new FailureLocation((Location)node.getUserData(WSDLConstants.NODE_LOCATION),
+                                           doc.getDocumentURI());
+            }
+        }
+        return null;
+    }
+    
+    public boolean isValid() {
+        try {
+
+            collectValidationPoints();
+            
+            List<Document> wsdlDocs = getWSDLDocuments();
+            for (XNode vNode : vNodes) {
+
+                if (!isExist(wsdlDocs, vNode)) {
+                    FailureLocation loc = getFailureLocation(wsdlDocs, vNode.getFailurePoint());
+                    vResults.addError(new Message("FAILED_AT_POINT",
+                                                  LOG,
+                                                  loc.getLocation().getLineNumber(),
+                                                  loc.getLocation().getColumnNumber(),
+                                                  loc.getDocumentURI(),
+                                                  vNode.getPlainText()));
+                }
+            }
+        } catch (ToolException e) {
+            this.vResults.addError(e.getMessage());
+            return false;
+        }
+        return vResults.isSuccessful();
+    }
+
+    public void setDefinition(final Definition def) {
+        this.definition = def;
+    }
+
+    private Map<QName, Service> getServices() {
+        Map<QName, Service> services = new HashMap<QName, Service>();
+        Iterator sNames = definition.getAllServices().keySet().iterator();
+        while (sNames.hasNext()) {
+            QName sName = (QName) sNames.next();
+            services.put(sName, definition.getService(sName));
+        }
+        return services;
+    }
+
+    private Map<QName, XNode> getBindings(Service service) {
+        Map<QName, XNode> bindings = new HashMap<QName, XNode>();
+
+        if (service.getPorts().values().size() == 0) {
+            throw new ToolException("Service " + service.getQName() + " does not contain any usable ports");
+        }
+        Iterator portIte = service.getPorts().values().iterator();
+        while (portIte.hasNext()) {
+            Port port = (Port)portIte.next();
+            Binding binding = port.getBinding();
+            bindings.put(binding.getQName(), getXNode(service, port));
+            if (WSDLConstants.WSDL11_NAMESPACE.equals(binding.getQName().getNamespaceURI())) {
+                throw new ToolException("Binding "
+                                        + binding.getQName().getLocalPart()
+                                        + " namespace set improperly.");
+            }
+        }
+
+        return bindings;
+    }
+
+    private Map<QName, Operation> getOperations(PortType portType) {
+        Map<QName, Operation> operations = new HashMap<QName, Operation>();
+        for (Iterator iter = portType.getOperations().iterator(); iter.hasNext();) {
+            Operation op = (Operation) iter.next();
+            operations.put(new QName(portType.getQName().getNamespaceURI(), op.getName()), op);
+        }
+        return operations;
+    }
+
+    private XNode getXNode(Service service, Port port) {
+        XNode vService = getXNode(service);
+
+        XPort pNode = new XPort();
+        pNode.setName(port.getName());
+        pNode.setParentNode(vService);
+        return pNode;
+    }
+    
+    private XNode getXNode(Service service) {
+        XDef xdef = new XDef();
+        xdef.setTargetNamespace(service.getQName().getNamespaceURI());
+
+        XService sNode = new XService();
+        sNode.setName(service.getQName().getLocalPart());
+        sNode.setParentNode(xdef);
+        return sNode;
+    }
+    
+    private XNode getXNode(Binding binding) {
+        XDef xdef = new XDef();
+        xdef.setTargetNamespace(binding.getQName().getNamespaceURI());
+
+        XBinding bNode = new XBinding();
+        bNode.setName(binding.getQName().getLocalPart());
+        bNode.setParentNode(xdef);
+        return bNode;
+    }
+
+    private XNode getXNode(PortType portType) {
+        XDef xdef = new XDef();
+        xdef.setTargetNamespace(portType.getQName().getNamespaceURI());
+
+        XPortType pNode = new XPortType();
+        pNode.setName(portType.getQName().getLocalPart());
+        pNode.setParentNode(xdef);
+        return pNode;
+    }
+
+    private XNode getOperationXNode(XNode pNode, String opName) {
+        XOperation node = new XOperation();
+        node.setName(opName);
+        node.setParentNode(pNode);
+        return node;
+    }
+
+    private XNode getInputXNode(XNode opVNode, String name) {
+        XInput oNode = new XInput();
+        oNode.setName(name);
+        oNode.setParentNode(opVNode);
+        return oNode;
+    }
+
+    private XNode getOutputXNode(XNode opVNode, String name) {
+        XOutput oNode = new XOutput();
+        oNode.setName(name);
+        oNode.setParentNode(opVNode);
+        return oNode;
+    }
+
+    private XNode getFaultXNode(XNode opVNode, String name) {
+        XFault oNode = new XFault();
+        oNode.setName(name);
+        oNode.setParentNode(opVNode);
+        return oNode;
+    }
+
+    private XNode getXNode(javax.wsdl.Message msg) {
+        XDef xdef = new XDef();
+        xdef.setTargetNamespace(msg.getQName().getNamespaceURI());
+
+        XMessage mNode = new XMessage();
+        mNode.setName(msg.getQName().getLocalPart());
+        mNode.setParentNode(xdef);
+        return mNode;
+    }
+
+    private void addWarning(String warningMsg) {
+        if (suppressWarnings) {
+            return;
+        }
+        vResults.addWarning(warningMsg);
+    }
+    
+    @SuppressWarnings("unchecked")
+    private void collectValidationPoints() {
+        if (getServices().size() == 0) {
+            addWarning("WSDL document does not define any services");
+            portTypeRefNames.addAll(this.definition.getAllPortTypes().keySet());
+        } else {
+            collectValidationPointsForBindings();
+        }
+
+        collectValidationPointsForPortTypes();
+        collectValidationPointsForMessages();
+    }
+
+    private void collectValidationPointsForBindings() {
+        Map<QName, XNode> vBindingNodes = new HashMap<QName, XNode>();
+        for (Service service : getServices().values()) {
+            vBindingNodes.putAll(getBindings(service));
+        }
+        
+        for (QName bName : vBindingNodes.keySet()) {
+            Binding binding = this.definition.getBinding(bName);
+            XNode vBindingNode = getXNode(binding);
+            vBindingNode.setFailurePoint(vBindingNodes.get(bName));
+            vNodes.add(vBindingNode);
+
+            if (binding.getPortType() == null) {
+                continue;
+            }
+            portTypeRefNames.add(binding.getPortType().getQName());
+
+            XNode vPortTypeNode = getXNode(binding.getPortType());
+            vPortTypeNode.setFailurePoint(vBindingNode);
+            vNodes.add(vPortTypeNode);
+            for (Iterator iter = binding.getBindingOperations().iterator(); iter.hasNext();) {
+                BindingOperation bop = (BindingOperation) iter.next();
+                XNode vOpNode = getOperationXNode(vPortTypeNode, bop.getName());
+                XNode vBopNode = getOperationXNode(vBindingNode, bop.getName());
+                vOpNode.setFailurePoint(vBopNode);
+                vNodes.add(vOpNode);
+                String inName = bop.getBindingInput().getName();
+                if (!StringUtils.isEmpty(inName)) {
+                    XNode vInputNode = getInputXNode(vOpNode, inName);
+                    vInputNode.setFailurePoint(getInputXNode(vBopNode, inName));
+                    vNodes.add(vInputNode);
+                }
+                if (bop.getBindingOutput() != null) {
+                    String outName = bop.getBindingOutput().getName();
+                    if (!StringUtils.isEmpty(outName)) {
+                        XNode vOutputNode = getOutputXNode(vOpNode, outName);
+                        vOutputNode.setFailurePoint(getOutputXNode(vBopNode, outName));
+                        vNodes.add(vOutputNode);
+                    }
+                }
+                for (Iterator iter1 = bop.getBindingFaults().keySet().iterator(); iter1.hasNext();) {
+                    String faultName = (String) iter1.next();
+                    XNode vFaultNode = getFaultXNode(vOpNode, faultName);
+                    vFaultNode.setFailurePoint(getFaultXNode(vBopNode, faultName));
+                    vNodes.add(vFaultNode);
+                }
+            }
+        }
+    }
+
+    private void collectValidationPointsForMessages() {
+        for (QName msgName : messageRefNames) {
+            javax.wsdl.Message message = this.definition.getMessage(msgName);
+            for (Iterator iter = message.getParts().values().iterator(); iter.hasNext();) {
+                Part part = (Part) iter.next();
+                QName elementName = part.getElementName();
+                QName typeName = part.getTypeName();
+
+                if (elementName == null && typeName == null) {
+                    vResults.addError(new Message("PART_NO_TYPES", LOG));
+                    continue;
+                }
+
+                if (elementName != null && typeName != null) {
+                    vResults.addError(new Message("PART_NOT_UNIQUE", LOG));
+                    continue;
+                }
+
+                if (elementName != null && typeName == null) {
+                    boolean valid = validatePartType(elementName.getNamespaceURI(),
+                                                     elementName.getLocalPart(), true);
+                    if (!valid) {
+                        vResults.addError(new Message("TYPE_REF_NOT_FOUND", LOG, message.getQName(),
+                                                      part.getName(), elementName));
+                    }
+
+                }
+                if (typeName != null && elementName == null) {
+                    boolean valid = validatePartType(typeName.getNamespaceURI(),
+                                                     typeName.getLocalPart(),
+                                                     false);
+                    if (!valid) {
+                        vResults.addError(new Message("TYPE_REF_NOT_FOUND", LOG, message.getQName(),
+                                                      part.getName(), typeName));
+                    }
+                }
+            }
+        }
+    }
+
+    private void collectValidationPointsForPortTypes() {
+        for (QName ptName : portTypeRefNames) {
+            PortType portType = this.definition.getPortType(ptName);
+            XNode vPortTypeNode = getXNode(portType);
+            for (Operation operation : getOperations(portType).values()) {
+                XNode vOperationNode = getOperationXNode(vPortTypeNode, operation.getName());
+                javax.wsdl.Message inMsg = operation.getInput().getMessage();
+                if (inMsg == null) {
+                    addWarning("Operation " + operation.getName() + " in PortType: "
+                               + portType.getQName() + " has no input message");
+                } else {
+                    XNode vInMsgNode = getXNode(inMsg);
+                    vInMsgNode.setFailurePoint(getInputXNode(vOperationNode, operation.getInput().getName()));
+                    vNodes.add(vInMsgNode);
+                    messageRefNames.add(inMsg.getQName());
+                }
+
+                if (operation.getOutput() != null) {
+                    javax.wsdl.Message outMsg = operation.getOutput().getMessage();
+
+                    if (outMsg == null) {
+                        addWarning("Operation " + operation.getName() + " in PortType: "
+                                   + portType.getQName() + " has no output message");
+                    } else {
+                        XNode vOutMsgNode = getXNode(outMsg);
+                        vOutMsgNode.setFailurePoint(getOutputXNode(vOperationNode,
+                                                                   operation.getOutput().getName()));
+                        vNodes.add(vOutMsgNode);
+                        messageRefNames.add(outMsg.getQName());
+                    }
+                }
+                for (Iterator iter = operation.getFaults().values().iterator(); iter.hasNext();) {
+                    Fault fault = (Fault) iter.next();
+                    javax.wsdl.Message faultMsg = fault.getMessage();
+                    XNode vFaultMsgNode = getXNode(faultMsg);
+                    vFaultMsgNode.setFailurePoint(getFaultXNode(vOperationNode, fault.getName()));
+                    vNodes.add(vFaultMsgNode);
+                    messageRefNames.add(faultMsg.getQName());
+                }
+            }
+        }
+    }
+
+    private boolean validatePartType(String namespace, String name, boolean isElement) {
+
+        boolean partvalid = false;
+
+        if (namespace.equals(WSDLConstants.NU_SCHEMA_XSD)) {
+            if (isElement) {
+                XmlSchemaElement  schemaEle = 
+                    schemaCollection.getElementByQName(new QName(WSDLConstants.NU_SCHEMA_XSD, name));    
+                partvalid = schemaEle != null ? true : false;
+            } else {
+                XmlSchemaType schemaType = 
+                    schemaCollection.getTypeByQName(new QName(WSDLConstants.NU_SCHEMA_XSD, name));  
+                partvalid = schemaType != null ? true : false;
+            }
+            
+        } else {
+            if (isElement) {
+                for (XmlSchemaCollection schema : schemas) {
+                    if (schema != null && schema.getElementByQName(
+                            new QName(namespace, name)) != null) {
+                        partvalid = true;
+                        break;
+                    }
+                }
+            } else {
+                for (XmlSchemaCollection schema : schemas) {
+                    if (schema != null && schema.getTypeByQName(
+                            new QName(namespace, name)) != null) {
+                        partvalid = true;
+                        break;
+                    }
+                }
+            }
+        }
+        return partvalid;
+    }
+
+    public String getErrorMessage() {
+        return vResults.toString();
+    }
+
+    public Definition getDefinition() {
+        return this.definition;
+    }
+}

Propchange: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/FailureLocation.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/FailureLocation.java?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/FailureLocation.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/FailureLocation.java Wed Jun 13 14:45:28 2007
@@ -1,50 +1,50 @@
-/**
- * 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.validator.internal.model;
-
-import javax.xml.stream.Location;
-
-public final class FailureLocation {
-
-    private Location location;
-
-    private String documentURI;
-
-    public FailureLocation(Location loc, String docURI) {
-        this.location = loc;
-        this.documentURI = docURI;
-    }
-
-    public Location getLocation() {
-        return location;
-    }
-
-    public void setLocation(final Location newLocation) {
-        this.location = newLocation;
-    }
-
-    public String getDocumentURI() {
-        return documentURI;
-    }
-
-    public void setDocumentURI(final String newDocumentURI) {
-        this.documentURI = newDocumentURI;
-    }
-}
+/**
+ * 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.validator.internal.model;
+
+import javax.xml.stream.Location;
+
+public final class FailureLocation {
+
+    private Location location;
+
+    private String documentURI;
+
+    public FailureLocation(Location loc, String docURI) {
+        this.location = loc;
+        this.documentURI = docURI;
+    }
+
+    public Location getLocation() {
+        return location;
+    }
+
+    public void setLocation(final Location newLocation) {
+        this.location = newLocation;
+    }
+
+    public String getDocumentURI() {
+        return documentURI;
+    }
+
+    public void setDocumentURI(final String newDocumentURI) {
+        this.documentURI = newDocumentURI;
+    }
+}

Propchange: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/FailureLocation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/FailureLocation.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java?view=diff&rev=547040&r1=547039&r2=547040
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java Wed Jun 13 14:45:28 2007
@@ -1,30 +1,30 @@
-/**
- * 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.validator.internal.model;
-
-import org.apache.cxf.wsdl.WSDLConstants;
-
-public final class XBinding extends XWsdl {
-
-    public XBinding() {
-        super();
-        setQName(WSDLConstants.QNAME_BINDING);
-    }
-}
+/**
+ * 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.validator.internal.model;
+
+import org.apache.cxf.wsdl.WSDLConstants;
+
+public final class XBinding extends XWsdl {
+
+    public XBinding() {
+        super();
+        setQName(WSDLConstants.QNAME_BINDING);
+    }
+}



Mime
View raw message