Merge interface-wsdl-xml into interface-wsdl module

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@768518 13f79535-47bb-0310-9956-ffa450edef68

50 files changed, 1762 insertions, 2090 deletions

diff --git a/java/sca/features/core/pom.xml b/java/sca/features/core/pom.xml
index 5278bfe053..e2e63279bb 100644
--- a/java/sca/features/core/pom.xml
+++ b/java/sca/features/core/pom.xml
@@ -195,7 +195,7 @@
         </dependency>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-wsdl-xml</artifactId>

+            <artifactId>tuscany-interface-wsdl</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

 

diff --git a/java/sca/modules/binding-ws-axis2/pom.xml b/java/sca/modules/binding-ws-axis2/pom.xml
index 3dae559d2c..fdb2d83e6f 100644
--- a/java/sca/modules/binding-ws-axis2/pom.xml
+++ b/java/sca/modules/binding-ws-axis2/pom.xml
@@ -53,13 +53,6 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
diff --git a/java/sca/modules/binding-ws-jaxws/pom.xml b/java/sca/modules/binding-ws-jaxws/pom.xml
index 858e574ca9..88c88d77a9 100644
--- a/java/sca/modules/binding-ws-jaxws/pom.xml
+++ b/java/sca/modules/binding-ws-jaxws/pom.xml
@@ -45,13 +45,6 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
diff --git a/java/sca/modules/binding-ws-wsdlgen/pom.xml b/java/sca/modules/binding-ws-wsdlgen/pom.xml
index 7e10affde8..04c3104884 100644
--- a/java/sca/modules/binding-ws-wsdlgen/pom.xml
+++ b/java/sca/modules/binding-ws-wsdlgen/pom.xml
@@ -42,11 +42,6 @@
         </dependency>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-interface-java</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

diff --git a/java/sca/modules/binding-ws-xml/pom.xml b/java/sca/modules/binding-ws-xml/pom.xml
index 96b3c9affc..060d1b1787 100644
--- a/java/sca/modules/binding-ws-xml/pom.xml
+++ b/java/sca/modules/binding-ws-xml/pom.xml
@@ -66,11 +66,6 @@
             <scope>test</scope>
         </dependency>         
         
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>                
     </dependencies>
 
 </project>
diff --git a/java/sca/modules/implementation-bpel-ode/pom.xml b/java/sca/modules/implementation-bpel-ode/pom.xml
index 4c568f8efb..e0e3c5f36d 100644
--- a/java/sca/modules/implementation-bpel-ode/pom.xml
+++ b/java/sca/modules/implementation-bpel-ode/pom.xml
@@ -83,11 +83,6 @@
             <artifactId>tuscany-interface-wsdl</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

 

         <!-- ODE Jars -->

         <dependency>

diff --git a/java/sca/modules/implementation-bpel/pom.xml b/java/sca/modules/implementation-bpel/pom.xml
index d1debb78f6..39959337b8 100644
--- a/java/sca/modules/implementation-bpel/pom.xml
+++ b/java/sca/modules/implementation-bpel/pom.xml
@@ -61,12 +61,6 @@
 

 		<dependency>

 			<groupId>org.apache.tuscany.sca</groupId>

-			<artifactId>tuscany-interface-wsdl-xml</artifactId>

-			<version>2.0-SNAPSHOT</version>

-		</dependency>

-

-		<dependency>

-			<groupId>org.apache.tuscany.sca</groupId>

 			<artifactId>tuscany-databinding</artifactId>

 			<version>2.0-SNAPSHOT</version>

 		</dependency>

diff --git a/java/sca/modules/interface-wsdl-xml/LICENSE b/java/sca/modules/interface-wsdl-xml/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca/modules/interface-wsdl-xml/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-
diff --git a/java/sca/modules/interface-wsdl-xml/META-INF/MANIFEST.MF b/java/sca/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
deleted file mode 100644
index 0c1563efd3..0000000000
--- a/java/sca/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.interfacedef.wsdl.xml;version=

- "2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA WSDL Interface XML Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397292156

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA WSDL Interface XML Model

-Import-Package: javax.wsdl,

- javax.wsdl.extensions,

- javax.wsdl.extensions.schema,

- javax.wsdl.factory,

- javax.wsdl.xml,

- javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.namespace;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.xsd;version="2.0.0",

- org.apache.tuscany.sca.xsd.xml;version="2.0.0",

- org.apache.ws.commons.schema,

- org.w3c.dom,

- org.xml.sax

-Bundle-SymbolicName: org.apache.tuscany.sca.interface.wsdl.xml

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca/modules/interface-wsdl-xml/NOTICE b/java/sca/modules/interface-wsdl-xml/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca/modules/interface-wsdl-xml/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca/modules/interface-wsdl-xml/pom.xml b/java/sca/modules/interface-wsdl-xml/pom.xml
deleted file mode 100644
index b30e645511..0000000000
--- a/java/sca/modules/interface-wsdl-xml/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-interface-wsdl-xml</artifactId>
-    <name>Apache Tuscany SCA WSDL Interface XML Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>        
-    </dependencies>
-
-</project>
diff --git a/java/sca/modules/interface-wsdl/META-INF/MANIFEST.MF b/java/sca/modules/interface-wsdl/META-INF/MANIFEST.MF
index d5e177591f..1582498b84 100644
--- a/java/sca/modules/interface-wsdl/META-INF/MANIFEST.MF
+++ b/java/sca/modules/interface-wsdl/META-INF/MANIFEST.MF
@@ -17,12 +17,18 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA WSDL Interface Model

 Import-Package: javax.wsdl,

  javax.wsdl.extensions,

+ javax.wsdl.extensions.schema,

+ javax.wsdl.factory,

+ javax.wsdl.xml,

  javax.xml.namespace,

  org.apache.tuscany.sca.assembly;version="2.0.0",

+ org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,

  org.apache.tuscany.sca.contribution;version="2.0.0";resolution:=optional,

+ org.apache.tuscany.sca.contribution.namespace;version="2.0.0",

  org.apache.tuscany.sca.contribution.processor;version="2.0.0";resolution:=optional,

  org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

  org.apache.tuscany.sca.core;version="2.0.0",

+ org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,

  org.apache.tuscany.sca.interfacedef;version="2.0.0",

  org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",

  org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

@@ -30,7 +36,10 @@ Import-Package: javax.wsdl,
  org.apache.tuscany.sca.monitor;version="2.0.0";resolution:=optional,

  org.apache.tuscany.sca.policy;version="2.0.0",

  org.apache.tuscany.sca.xsd;version="2.0.0",

- org.apache.ws.commons.schema

+ org.apache.tuscany.sca.xsd.xml;version="2.0.0",

+ org.apache.ws.commons.schema,

+ org.w3c.dom,

+ org.xml.sax

 Bundle-SymbolicName: org.apache.tuscany.sca.interface.wsdl

 Bundle-DocURL: http://www.apache.org/

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca/modules/interface-wsdl/pom.xml b/java/sca/modules/interface-wsdl/pom.xml
index 3d0a63581f..7be80b34af 100644
--- a/java/sca/modules/interface-wsdl/pom.xml
+++ b/java/sca/modules/interface-wsdl/pom.xml
@@ -49,6 +49,12 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-namespace</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>        
@@ -64,6 +70,20 @@
              <artifactId>wsdl4j</artifactId>
              <version>1.6.2</version>
          </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+         
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>        
+
     </dependencies>
 
     <repositories>
diff --git a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java b/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
index 5178149b63..5178149b63 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
+++ b/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
diff --git a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
index b1c431c19d..7d48dc62bd 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
+++ b/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
@@ -1,38 +1,38 @@
-/*
- * 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.tuscany.sca.interfacedef.wsdl.xml;
-
-import javax.xml.namespace.QName;
-
-/**
- * Constants for WSDL.
- *
- * @version $Rev$ $Date$
- */
-public interface WSDLConstants {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
-    String INTERFACE_WSDL = "interface.wsdl";
-    QName INTERFACE_WSDL_QNAME = new QName(SCA11_NS, "interface.wsdl");
-    String INTERFACE = "interface";
-    String CALLBACK_INTERFACE = "callbackInterface";
-    String WSDL_LOCATION = "wsdlLocation";
-    String WSDLI_NS = "http://www.w3.org/2004/08/wsdl-instance";
-    QName WSDL_LOCATION_QNAME = new QName(WSDLI_NS, WSDL_LOCATION); 
-
-}
+/*

+ * 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.tuscany.sca.interfacedef.wsdl.xml;

+

+import javax.xml.namespace.QName;

+

+/**

+ * Constants for WSDL.

+ *

+ * @version $Rev: 750765 $ $Date: 2009-03-06 04:36:04 +0000 (Fri, 06 Mar 2009) $

+ */

+public interface WSDLConstants {

+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";

+    String INTERFACE_WSDL = "interface.wsdl";

+    QName INTERFACE_WSDL_QNAME = new QName(SCA11_NS, "interface.wsdl");

+    String INTERFACE = "interface";

+    String CALLBACK_INTERFACE = "callbackInterface";

+    String WSDL_LOCATION = "wsdlLocation";

+    String WSDLI_NS = "http://www.w3.org/2004/08/wsdl-instance";

+    QName WSDL_LOCATION_QNAME = new QName(WSDLI_NS, WSDL_LOCATION); 

+

+}

diff --git a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java b/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
index 8331215067..88f6100c05 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
+++ b/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
@@ -1,229 +1,229 @@
-/*
- * 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.tuscany.sca.interfacedef.wsdl.xml;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-
-/**
- * An ArtifactProcessor for WSDL documents.
- * 
- * @version $Rev$ $Date$
- */
-public class WSDLDocumentProcessor implements URLArtifactProcessor<WSDLDefinition> {
-
-    public static final QName WSDL11 = new QName("http://schemas.xmlsoap.org/wsdl/", "definitions");
-    public static final QName WSDL11_IMPORT = new QName("http://schemas.xmlsoap.org/wsdl/", "import");
-    public static final QName XSD = new QName("http://www.w3.org/2001/XMLSchema", "schema");
-
-    private static final XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-
-    private WSDLFactory factory;
-    private XSDFactory xsdFactory;
-    private Monitor monitor;
-
-    public WSDLDocumentProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.factory = modelFactories.getFactory(WSDLFactory.class);
-        this.xsdFactory = modelFactories.getFactory(XSDFactory.class);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a exception.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void error(String message, Object model, Exception ex) {
-    	 if (monitor != null) {
-    		 Problem problem = monitor.createProblem(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.ERROR, model, message, ex);
-    	     monitor.problem(problem);
-    	 }        
-     }
-
-    public WSDLDefinition read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
-        try {
-            WSDLDefinition definition = indexRead(artifactURL);
-            definition.setURI(artifactURI);
-            return definition;
-        } catch (Exception e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", artifactURL, ce);
-            //throw ce;
-        	return null;
-        }
-    }
-
-    public void resolve(WSDLDefinition model, ModelResolver resolver) throws ContributionResolveException {
-        if (model == null) return;
-    	
-        Definition definition = model.getDefinition();
-        if (definition != null) {
-            for (Object imports : definition.getImports().values()) {
-                List importList = (List)imports;
-                for (Object i : importList) {
-                    Import imp = (Import)i;
-                    if (imp.getDefinition() != null) {
-                        continue;
-                    }
-                    if (imp.getLocationURI() == null) {
-                        // FIXME: [rfeng] By the WSDL 1.1 Specification, the location attribute is required
-                        // We need to resolve it by QName
-                        WSDLDefinition proxy = factory.createWSDLDefinition();
-                        proxy.setUnresolved(true);
-                        proxy.setNamespace(imp.getNamespaceURI());
-                        WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, proxy);
-                        if (resolved != null && !resolved.isUnresolved()) {
-                            imp.setDefinition(resolved.getDefinition());
-                            if (!model.getImportedDefinitions().contains(resolved)) {
-                                model.getImportedDefinitions().add(resolved);
-                            }
-                        }
-                    } else {
-                        String location = imp.getLocationURI();
-                        URI uri = URI.create(location);
-                        if (uri.isAbsolute()) {
-                            WSDLDefinition resolved;
-                            try {
-                                resolved = read(null, uri, uri.toURL());
-                                imp.setDefinition(resolved.getDefinition());
-                                if (!model.getImportedDefinitions().contains(resolved)) {
-                                    model.getImportedDefinitions().add(resolved);
-                                }
-                            } catch (Exception e) {
-                            	ContributionResolveException ce = new ContributionResolveException(e);
-                            	error("ContributionResolveException", resolver, ce);
-                                //throw ce;
-                            }
-                        } else {
-                            if (location.startsWith("/")) {
-                                // This is a relative URI against a contribution
-                                location = location.substring(1);
-                                // TODO: Need to resolve it against the contribution
-                            } else {
-                                // This is a relative URI against the WSDL document
-                                URI baseURI = URI.create(model.getDefinition().getDocumentBaseURI());
-                                URI locationURI = baseURI.resolve(location);
-                                WSDLDefinition resolved;
-                                try {
-                                    resolved = read(null, locationURI, locationURI.toURL());
-                                    imp.setDefinition(resolved.getDefinition());
-                                    if (!model.getImportedDefinitions().contains(resolved)) {
-                                        model.getImportedDefinitions().add(resolved);
-                                    }
-                                } catch (Exception e) {
-                                	ContributionResolveException ce = new ContributionResolveException(e);
-                                	error("ContributionResolveException", resolver, ce);
-                                    //throw ce;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public String getArtifactType() {
-        return ".wsdl";
-    }
-
-    public Class<WSDLDefinition> getModelType() {
-        return WSDLDefinition.class;
-    }
-
-    /**
-     * Read the namespace for the WSDL definition and inline schemas
-     * 
-     * @param doc
-     * @return
-     * @throws IOException
-     * @throws XMLStreamException
-     */
-    protected WSDLDefinition indexRead(URL doc) throws Exception {
-        WSDLDefinition wsdlDefinition = factory.createWSDLDefinition();
-        wsdlDefinition.setUnresolved(true);
-        wsdlDefinition.setLocation(doc.toURI());
-
-        InputStream is = doc.openStream();
-        try {
-            XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-            int eventType = reader.getEventType();
-            int index = 0;
-            while (true) {
-                if (eventType == XMLStreamConstants.START_ELEMENT) {
-                    if (WSDL11.equals(reader.getName())) {
-                        String tns = reader.getAttributeValue(null, "targetNamespace");
-                        wsdlDefinition.setNamespace(tns);
-                        // The definition is marked as resolved but not loaded
-                        wsdlDefinition.setUnresolved(false);
-                        wsdlDefinition.setDefinition(null);
-                    }
-                    if (XSD.equals(reader.getName())) {
-                        String tns = reader.getAttributeValue(null, "targetNamespace");
-                        XSDefinition xsd = xsdFactory.createXSDefinition();
-                        xsd.setUnresolved(true);
-                        xsd.setNamespace(tns);
-                        xsd.setLocation(URI.create(doc.toURI() + "#" + index));
-                        index++;
-                        // The definition is marked as resolved but not loaded
-                        xsd.setUnresolved(false);
-                        xsd.setSchema(null);
-                        wsdlDefinition.getXmlSchemas().add(xsd);
-                    }
-                }
-                if (reader.hasNext()) {
-                    eventType = reader.next();
-                } else {
-                    break;
-                }
-            }
-            return wsdlDefinition;
-        } finally {
-            is.close();
-        }
-    }
-
-}
+/*

+ * 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.tuscany.sca.interfacedef.wsdl.xml;

+

+import java.io.IOException;

+import java.io.InputStream;

+import java.net.URI;

+import java.net.URL;

+import java.util.List;

+

+import javax.wsdl.Definition;

+import javax.wsdl.Import;

+import javax.xml.namespace.QName;

+import javax.xml.stream.XMLInputFactory;

+import javax.xml.stream.XMLStreamConstants;

+import javax.xml.stream.XMLStreamException;

+import javax.xml.stream.XMLStreamReader;

+

+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;

+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;

+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

+import org.apache.tuscany.sca.core.FactoryExtensionPoint;

+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;

+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;

+import org.apache.tuscany.sca.monitor.Monitor;

+import org.apache.tuscany.sca.monitor.Problem;

+import org.apache.tuscany.sca.monitor.Problem.Severity;

+import org.apache.tuscany.sca.xsd.XSDFactory;

+import org.apache.tuscany.sca.xsd.XSDefinition;

+

+/**

+ * An ArtifactProcessor for WSDL documents.

+ * 

+ * @version $Rev: 709339 $ $Date: 2008-10-31 04:01:44 +0000 (Fri, 31 Oct 2008) $

+ */

+public class WSDLDocumentProcessor implements URLArtifactProcessor<WSDLDefinition> {

+

+    public static final QName WSDL11 = new QName("http://schemas.xmlsoap.org/wsdl/", "definitions");

+    public static final QName WSDL11_IMPORT = new QName("http://schemas.xmlsoap.org/wsdl/", "import");

+    public static final QName XSD = new QName("http://www.w3.org/2001/XMLSchema", "schema");

+

+    private static final XMLInputFactory inputFactory = XMLInputFactory.newInstance();

+

+    private WSDLFactory factory;

+    private XSDFactory xsdFactory;

+    private Monitor monitor;

+

+    public WSDLDocumentProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {

+        this.factory = modelFactories.getFactory(WSDLFactory.class);

+        this.xsdFactory = modelFactories.getFactory(XSDFactory.class);

+        this.monitor = monitor;

+    }

+    

+    /**

+     * Report a exception.

+     * 

+     * @param problems

+     * @param message

+     * @param model

+     */

+     private void error(String message, Object model, Exception ex) {

+    	 if (monitor != null) {

+    		 Problem problem = monitor.createProblem(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.ERROR, model, message, ex);

+    	     monitor.problem(problem);

+    	 }        

+     }

+

+    public WSDLDefinition read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {

+        try {

+            WSDLDefinition definition = indexRead(artifactURL);

+            definition.setURI(artifactURI);

+            return definition;

+        } catch (Exception e) {

+        	ContributionReadException ce = new ContributionReadException(e);

+        	error("ContributionReadException", artifactURL, ce);

+            //throw ce;

+        	return null;

+        }

+    }

+

+    public void resolve(WSDLDefinition model, ModelResolver resolver) throws ContributionResolveException {

+        if (model == null) return;

+    	

+        Definition definition = model.getDefinition();

+        if (definition != null) {

+            for (Object imports : definition.getImports().values()) {

+                List importList = (List)imports;

+                for (Object i : importList) {

+                    Import imp = (Import)i;

+                    if (imp.getDefinition() != null) {

+                        continue;

+                    }

+                    if (imp.getLocationURI() == null) {

+                        // FIXME: [rfeng] By the WSDL 1.1 Specification, the location attribute is required

+                        // We need to resolve it by QName

+                        WSDLDefinition proxy = factory.createWSDLDefinition();

+                        proxy.setUnresolved(true);

+                        proxy.setNamespace(imp.getNamespaceURI());

+                        WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, proxy);

+                        if (resolved != null && !resolved.isUnresolved()) {

+                            imp.setDefinition(resolved.getDefinition());

+                            if (!model.getImportedDefinitions().contains(resolved)) {

+                                model.getImportedDefinitions().add(resolved);

+                            }

+                        }

+                    } else {

+                        String location = imp.getLocationURI();

+                        URI uri = URI.create(location);

+                        if (uri.isAbsolute()) {

+                            WSDLDefinition resolved;

+                            try {

+                                resolved = read(null, uri, uri.toURL());

+                                imp.setDefinition(resolved.getDefinition());

+                                if (!model.getImportedDefinitions().contains(resolved)) {

+                                    model.getImportedDefinitions().add(resolved);

+                                }

+                            } catch (Exception e) {

+                            	ContributionResolveException ce = new ContributionResolveException(e);

+                            	error("ContributionResolveException", resolver, ce);

+                                //throw ce;

+                            }

+                        } else {

+                            if (location.startsWith("/")) {

+                                // This is a relative URI against a contribution

+                                location = location.substring(1);

+                                // TODO: Need to resolve it against the contribution

+                            } else {

+                                // This is a relative URI against the WSDL document

+                                URI baseURI = URI.create(model.getDefinition().getDocumentBaseURI());

+                                URI locationURI = baseURI.resolve(location);

+                                WSDLDefinition resolved;

+                                try {

+                                    resolved = read(null, locationURI, locationURI.toURL());

+                                    imp.setDefinition(resolved.getDefinition());

+                                    if (!model.getImportedDefinitions().contains(resolved)) {

+                                        model.getImportedDefinitions().add(resolved);

+                                    }

+                                } catch (Exception e) {

+                                	ContributionResolveException ce = new ContributionResolveException(e);

+                                	error("ContributionResolveException", resolver, ce);

+                                    //throw ce;

+                                }

+                            }

+                        }

+                    }

+                }

+            }

+        }

+    }

+

+    public String getArtifactType() {

+        return ".wsdl";

+    }

+

+    public Class<WSDLDefinition> getModelType() {

+        return WSDLDefinition.class;

+    }

+

+    /**

+     * Read the namespace for the WSDL definition and inline schemas

+     * 

+     * @param doc

+     * @return

+     * @throws IOException

+     * @throws XMLStreamException

+     */

+    protected WSDLDefinition indexRead(URL doc) throws Exception {

+        WSDLDefinition wsdlDefinition = factory.createWSDLDefinition();

+        wsdlDefinition.setUnresolved(true);

+        wsdlDefinition.setLocation(doc.toURI());

+

+        InputStream is = doc.openStream();

+        try {

+            XMLStreamReader reader = inputFactory.createXMLStreamReader(is);

+            int eventType = reader.getEventType();

+            int index = 0;

+            while (true) {

+                if (eventType == XMLStreamConstants.START_ELEMENT) {

+                    if (WSDL11.equals(reader.getName())) {

+                        String tns = reader.getAttributeValue(null, "targetNamespace");

+                        wsdlDefinition.setNamespace(tns);

+                        // The definition is marked as resolved but not loaded

+                        wsdlDefinition.setUnresolved(false);

+                        wsdlDefinition.setDefinition(null);

+                    }

+                    if (XSD.equals(reader.getName())) {

+                        String tns = reader.getAttributeValue(null, "targetNamespace");

+                        XSDefinition xsd = xsdFactory.createXSDefinition();

+                        xsd.setUnresolved(true);

+                        xsd.setNamespace(tns);

+                        xsd.setLocation(URI.create(doc.toURI() + "#" + index));

+                        index++;

+                        // The definition is marked as resolved but not loaded

+                        xsd.setUnresolved(false);

+                        xsd.setSchema(null);

+                        wsdlDefinition.getXmlSchemas().add(xsd);

+                    }

+                }

+                if (reader.hasNext()) {

+                    eventType = reader.next();

+                } else {

+                    break;

+                }

+            }

+            return wsdlDefinition;

+        } finally {

+            is.close();

+        }

+    }

+

+}

diff --git a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index 8145ba3f8f..c88ec0ef32 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
+++ b/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
@@ -1,250 +1,250 @@
-/*
- * 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.tuscany.sca.interfacedef.wsdl.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import javax.wsdl.PortType;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfaceContract>, WSDLConstants {
-
-    private WSDLFactory wsdlFactory;
-    private Monitor monitor;
-
-    public WSDLInterfaceProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a warning.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void warning(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-     }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-     }
-   
-   /**
-    * Report a exception.
-    * 
-    * @param problems
-    * @param message
-    * @param model
-    */
-    private void error(String message, Object model, Exception ex) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.ERROR, model, message, ex);
-            monitor.problem(problem);
-        }        
-    }
-    
-    /**
-     * Create a WSDL interface from a URI.
-     * @param uri
-     * @return
-     * @throws ContributionReadException
-     */
-    private WSDLInterface createWSDLInterface(String uri) throws ContributionReadException {
-        
-    	WSDLInterface wsdlInterface = null;        
-
-        // Read a QName in the form:
-        // namespace#wsdl.interface(name)
-        int index = uri.indexOf('#');
-        if (index == -1) {
-        	error("InvalidWSDLInterfaceAttr", wsdlFactory, uri);
-            //throw new ContributionReadException("Invalid WSDL interface attribute: " + uri);
-        } else {
-        	wsdlInterface = wsdlFactory.createWSDLInterface();
-            wsdlInterface.setUnresolved(true);
-            String namespace = uri.substring(0, index);
-            String name = uri.substring(index + 1);
-            name = name.substring("wsdl.interface(".length(), name.length() - 1);
-            wsdlInterface.setName(new QName(namespace, name));
-        }       
-        
-        return wsdlInterface;
-    }
-
-    public WSDLInterfaceContract read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        // Read an <interface.wsdl>
-        WSDLInterfaceContract wsdlInterfaceContract = wsdlFactory.createWSDLInterfaceContract();
-        
-        // Read wsdlLocation
-        String location = reader.getAttributeValue(WSDLI_NS, WSDL_LOCATION);
-        wsdlInterfaceContract.setLocation(location);
-        
-        String uri = reader.getAttributeValue(null, INTERFACE);
-        if (uri != null) {
-            WSDLInterface wsdlInterface = createWSDLInterface(uri);
-            if (wsdlInterface != null)
-                wsdlInterfaceContract.setInterface(wsdlInterface);
-        }
-        
-        uri = reader.getAttributeValue(null, CALLBACK_INTERFACE);
-        if (uri != null) {
-            WSDLInterface wsdlCallbackInterface = createWSDLInterface(uri);
-            if (wsdlCallbackInterface != null)
-                wsdlInterfaceContract.setCallbackInterface(wsdlCallbackInterface);
-        }
-            
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && INTERFACE_WSDL_QNAME.equals(reader.getName())) {
-                break;
-            }
-        }
-        return wsdlInterfaceContract;
-    }
-    
-    public void write(WSDLInterfaceContract wsdlInterfaceContract, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        // Write an <interface.wsdl>
-        writer.writeStartElement(WSDLConstants.SCA11_NS, INTERFACE_WSDL);
-
-        // Write interface name
-        WSDLInterface wsdlInterface = (WSDLInterface)wsdlInterfaceContract.getInterface();
-        if (wsdlInterface != null) {
-            QName qname = wsdlInterface.getName();
-            String uri = qname.getNamespaceURI() + "#wsdl.interface(" + qname.getLocalPart() + ")";
-            writer.writeAttribute(INTERFACE, uri);
-        }
-
-        WSDLInterface wsdlCallbackInterface = (WSDLInterface)wsdlInterfaceContract.getCallbackInterface();
-        if (wsdlCallbackInterface != null) {
-            QName qname = wsdlCallbackInterface.getName();
-            String uri = qname.getNamespaceURI() + "#wsdl.interface(" + qname.getLocalPart() + ")";
-            writer.writeAttribute(CALLBACK_INTERFACE, uri);
-        }
-        
-        // Write location
-        if (wsdlInterfaceContract.getLocation() != null) {
-            writer.writeAttribute(WSDLI_NS, WSDL_LOCATION, wsdlInterfaceContract.getLocation());
-        }
-        
-        writer.writeEndElement();
-    }
-    
-    private WSDLInterface resolveWSDLInterface(WSDLInterface wsdlInterface, ModelResolver resolver) throws ContributionResolveException {
-        
-        if (wsdlInterface != null && wsdlInterface.isUnresolved()) {
-
-            // Resolve the WSDL interface
-            wsdlInterface = resolver.resolveModel(WSDLInterface.class, wsdlInterface);
-            if (wsdlInterface.isUnresolved()) {
-
-                // If the WSDL interface has never been resolved yet, do it now
-                // First, resolve the WSDL definition for the given namespace
-                WSDLDefinition wsdlDefinition = wsdlFactory.createWSDLDefinition();
-                wsdlDefinition.setUnresolved(true);
-                wsdlDefinition.setNamespace(wsdlInterface.getName().getNamespaceURI());
-                WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, wsdlDefinition);
-                if (!resolved.isUnresolved()) {
-                    wsdlDefinition.setDefinition(resolved.getDefinition());
-                    wsdlDefinition.setLocation(resolved.getLocation());
-                    wsdlDefinition.setURI(resolved.getURI());
-                    wsdlDefinition.getImportedDefinitions().addAll(resolved.getImportedDefinitions());
-                    wsdlDefinition.getXmlSchemas().addAll(resolved.getXmlSchemas());
-                    wsdlDefinition.setUnresolved(false);
-                    WSDLObject<PortType> portType = wsdlDefinition.getWSDLObject(PortType.class, wsdlInterface.getName());
-                    if (portType != null) {                        
-                        // Introspect the WSDL portType and add the resulting
-                        // WSDLInterface to the resolver
-                        try {
-                            wsdlDefinition.setDefinition(portType.getDefinition());
-                            wsdlInterface = wsdlFactory.createWSDLInterface(portType.getElement(), wsdlDefinition, resolver);
-                            wsdlInterface.setWsdlDefinition(wsdlDefinition);
-                            resolver.addModel(wsdlInterface);
-                        } catch (InvalidInterfaceException e) {
-                        	ContributionResolveException ce = new ContributionResolveException(e);
-                        	error("ContributionResolveException", wsdlFactory, ce);
-                            //throw ce;
-                        }                        
-                    }
-                    else {
-                    	warning("WsdlInterfaceDoesNotMatch", wsdlDefinition, wsdlInterface.getName());
-                    }
-                }
-            }
-        }
-        return wsdlInterface;
-    }
-    
-    public void resolve(WSDLInterfaceContract wsdlInterfaceContract, ModelResolver resolver) throws ContributionResolveException {
-        
-        // Resolve the interface and callback interface
-        WSDLInterface wsdlInterface = resolveWSDLInterface((WSDLInterface)wsdlInterfaceContract.getInterface(), resolver);
-        wsdlInterfaceContract.setInterface(wsdlInterface);
-        
-        WSDLInterface wsdlCallbackInterface = resolveWSDLInterface((WSDLInterface)wsdlInterfaceContract.getCallbackInterface(), resolver);
-        wsdlInterfaceContract.setCallbackInterface(wsdlCallbackInterface);
-    }
-    
-    public QName getArtifactType() {
-        return WSDLConstants.INTERFACE_WSDL_QNAME;
-    }
-    
-    public Class<WSDLInterfaceContract> getModelType() {
-        return WSDLInterfaceContract.class;
-    }
-}
+/*

+ * 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.tuscany.sca.interfacedef.wsdl.xml;

+

+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;

+

+import javax.wsdl.PortType;

+import javax.xml.namespace.QName;

+import javax.xml.stream.XMLStreamException;

+import javax.xml.stream.XMLStreamReader;

+import javax.xml.stream.XMLStreamWriter;

+

+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;

+import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;

+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

+import org.apache.tuscany.sca.core.FactoryExtensionPoint;

+import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;

+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;

+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;

+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;

+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;

+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;

+import org.apache.tuscany.sca.monitor.Monitor;

+import org.apache.tuscany.sca.monitor.Problem;

+import org.apache.tuscany.sca.monitor.Problem.Severity;

+

+/**

+ *

+ * @version $Rev: 750323 $ $Date: 2009-03-05 05:52:01 +0000 (Thu, 05 Mar 2009) $

+ */

+public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfaceContract>, WSDLConstants {

+

+    private WSDLFactory wsdlFactory;

+    private Monitor monitor;

+

+    public WSDLInterfaceProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {

+        this.wsdlFactory = modelFactories.getFactory(WSDLFactory.class);

+        this.monitor = monitor;

+    }

+    

+    /**

+     * Report a warning.

+     * 

+     * @param problems

+     * @param message

+     * @param model

+     */

+    private void warning(String message, Object model, Object... messageParameters) {

+        if (monitor != null) {

+            Problem problem = monitor.createProblem(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);

+            monitor.problem(problem);

+        }

+     }

+    

+    /**

+     * Report a error.

+     * 

+     * @param problems

+     * @param message

+     * @param model

+     */

+    private void error(String message, Object model, Object... messageParameters) {

+        if (monitor != null) {

+            Problem problem = monitor.createProblem(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);

+            monitor.problem(problem);

+        }

+     }

+   

+   /**

+    * Report a exception.

+    * 

+    * @param problems

+    * @param message

+    * @param model

+    */

+    private void error(String message, Object model, Exception ex) {

+        if (monitor != null) {

+            Problem problem = monitor.createProblem(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.ERROR, model, message, ex);

+            monitor.problem(problem);

+        }        

+    }

+    

+    /**

+     * Create a WSDL interface from a URI.

+     * @param uri

+     * @return

+     * @throws ContributionReadException

+     */

+    private WSDLInterface createWSDLInterface(String uri) throws ContributionReadException {

+        

+    	WSDLInterface wsdlInterface = null;        

+

+        // Read a QName in the form:

+        // namespace#wsdl.interface(name)

+        int index = uri.indexOf('#');

+        if (index == -1) {

+        	error("InvalidWSDLInterfaceAttr", wsdlFactory, uri);

+            //throw new ContributionReadException("Invalid WSDL interface attribute: " + uri);

+        } else {

+        	wsdlInterface = wsdlFactory.createWSDLInterface();

+            wsdlInterface.setUnresolved(true);

+            String namespace = uri.substring(0, index);

+            String name = uri.substring(index + 1);

+            name = name.substring("wsdl.interface(".length(), name.length() - 1);

+            wsdlInterface.setName(new QName(namespace, name));

+        }       

+        

+        return wsdlInterface;

+    }

+

+    public WSDLInterfaceContract read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

+        // Read an <interface.wsdl>

+        WSDLInterfaceContract wsdlInterfaceContract = wsdlFactory.createWSDLInterfaceContract();

+        

+        // Read wsdlLocation

+        String location = reader.getAttributeValue(WSDLI_NS, WSDL_LOCATION);

+        wsdlInterfaceContract.setLocation(location);

+        

+        String uri = reader.getAttributeValue(null, INTERFACE);

+        if (uri != null) {

+            WSDLInterface wsdlInterface = createWSDLInterface(uri);

+            if (wsdlInterface != null)

+                wsdlInterfaceContract.setInterface(wsdlInterface);

+        }

+        

+        uri = reader.getAttributeValue(null, CALLBACK_INTERFACE);

+        if (uri != null) {

+            WSDLInterface wsdlCallbackInterface = createWSDLInterface(uri);

+            if (wsdlCallbackInterface != null)

+                wsdlInterfaceContract.setCallbackInterface(wsdlCallbackInterface);

+        }

+            

+        // Skip to end element

+        while (reader.hasNext()) {

+            if (reader.next() == END_ELEMENT && INTERFACE_WSDL_QNAME.equals(reader.getName())) {

+                break;

+            }

+        }

+        return wsdlInterfaceContract;

+    }

+    

+    public void write(WSDLInterfaceContract wsdlInterfaceContract, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {

+        // Write an <interface.wsdl>

+        writer.writeStartElement(WSDLConstants.SCA11_NS, INTERFACE_WSDL);

+

+        // Write interface name

+        WSDLInterface wsdlInterface = (WSDLInterface)wsdlInterfaceContract.getInterface();

+        if (wsdlInterface != null) {

+            QName qname = wsdlInterface.getName();

+            String uri = qname.getNamespaceURI() + "#wsdl.interface(" + qname.getLocalPart() + ")";

+            writer.writeAttribute(INTERFACE, uri);

+        }

+

+        WSDLInterface wsdlCallbackInterface = (WSDLInterface)wsdlInterfaceContract.getCallbackInterface();

+        if (wsdlCallbackInterface != null) {

+            QName qname = wsdlCallbackInterface.getName();

+            String uri = qname.getNamespaceURI() + "#wsdl.interface(" + qname.getLocalPart() + ")";

+            writer.writeAttribute(CALLBACK_INTERFACE, uri);

+        }

+        

+        // Write location

+        if (wsdlInterfaceContract.getLocation() != null) {

+            writer.writeAttribute(WSDLI_NS, WSDL_LOCATION, wsdlInterfaceContract.getLocation());

+        }

+        

+        writer.writeEndElement();

+    }

+    

+    private WSDLInterface resolveWSDLInterface(WSDLInterface wsdlInterface, ModelResolver resolver) throws ContributionResolveException {

+        

+        if (wsdlInterface != null && wsdlInterface.isUnresolved()) {

+

+            // Resolve the WSDL interface

+            wsdlInterface = resolver.resolveModel(WSDLInterface.class, wsdlInterface);

+            if (wsdlInterface.isUnresolved()) {

+

+                // If the WSDL interface has never been resolved yet, do it now

+                // First, resolve the WSDL definition for the given namespace

+                WSDLDefinition wsdlDefinition = wsdlFactory.createWSDLDefinition();

+                wsdlDefinition.setUnresolved(true);

+                wsdlDefinition.setNamespace(wsdlInterface.getName().getNamespaceURI());

+                WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, wsdlDefinition);

+                if (!resolved.isUnresolved()) {

+                    wsdlDefinition.setDefinition(resolved.getDefinition());

+                    wsdlDefinition.setLocation(resolved.getLocation());

+                    wsdlDefinition.setURI(resolved.getURI());

+                    wsdlDefinition.getImportedDefinitions().addAll(resolved.getImportedDefinitions());

+                    wsdlDefinition.getXmlSchemas().addAll(resolved.getXmlSchemas());

+                    wsdlDefinition.setUnresolved(false);

+                    WSDLObject<PortType> portType = wsdlDefinition.getWSDLObject(PortType.class, wsdlInterface.getName());

+                    if (portType != null) {                        

+                        // Introspect the WSDL portType and add the resulting

+                        // WSDLInterface to the resolver

+                        try {

+                            wsdlDefinition.setDefinition(portType.getDefinition());

+                            wsdlInterface = wsdlFactory.createWSDLInterface(portType.getElement(), wsdlDefinition, resolver);

+                            wsdlInterface.setWsdlDefinition(wsdlDefinition);

+                            resolver.addModel(wsdlInterface);

+                        } catch (InvalidInterfaceException e) {

+                        	ContributionResolveException ce = new ContributionResolveException(e);

+                        	error("ContributionResolveException", wsdlFactory, ce);

+                            //throw ce;

+                        }                        

+                    }

+                    else {

+                    	warning("WsdlInterfaceDoesNotMatch", wsdlDefinition, wsdlInterface.getName());

+                    }

+                }

+            }

+        }

+        return wsdlInterface;

+    }

+    

+    public void resolve(WSDLInterfaceContract wsdlInterfaceContract, ModelResolver resolver) throws ContributionResolveException {

+        

+        // Resolve the interface and callback interface

+        WSDLInterface wsdlInterface = resolveWSDLInterface((WSDLInterface)wsdlInterfaceContract.getInterface(), resolver);

+        wsdlInterfaceContract.setInterface(wsdlInterface);

+        

+        WSDLInterface wsdlCallbackInterface = resolveWSDLInterface((WSDLInterface)wsdlInterfaceContract.getCallbackInterface(), resolver);

+        wsdlInterfaceContract.setCallbackInterface(wsdlCallbackInterface);

+    }

+    

+    public QName getArtifactType() {

+        return WSDLConstants.INTERFACE_WSDL_QNAME;

+    }

+    

+    public Class<WSDLInterfaceContract> getModelType() {

+        return WSDLInterfaceContract.class;

+    }

+}

diff --git a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
index 8c77acc93d..8c77acc93d 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
+++ b/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
diff --git a/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b2c8535138..b2c8535138 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/java/sca/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 553c764233..553c764233 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/java/sca/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/java/sca/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 30d2039e80..30d2039e80 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/java/sca/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/java/sca/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties b/java/sca/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties
index 2f8c3e0500..5af757be4b 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
+++ b/java/sca/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties
@@ -1,24 +1,24 @@
-#
-#
-#    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.
-#
-#
-ContributionReadException = ContributionReadException occured due to :
-ContributionResolveException = ContributionResolveException occured due to :
-InvalidWSDLInterfaceAttr = Invalid WSDL interface attribute: {0}
+#

+#

+#    Licensed to the Apache Software Foundation (ASF) under one

+#    or more contributor license agreements. See the NOTICE file

+#    distributed with this work for additional information

+#    regarding copyright ownership. The ASF licenses this file

+#    to you under the Apache License, Version 2.0 (the

+#    "License"); you may not use this file except in compliance

+#    with the License. You may obtain a copy of the License at

+#

+#    http://www.apache.org/licenses/LICENSE-2.0

+#

+#    Unless required by applicable law or agreed to in writing,

+#    software distributed under the License is distributed on an

+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+#    KIND, either express or implied. See the License for the

+#    specific language governing permissions and limitations

+#    under the License.

+#

+#

+ContributionReadException = ContributionReadException occured due to :

+ContributionResolveException = ContributionResolveException occured due to :

+InvalidWSDLInterfaceAttr = Invalid WSDL interface attribute: {0}

 WsdlInterfaceDoesNotMatch = The #wsdl.interface({0}) specified does not match with WSDL Definitions
\ No newline at end of file
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
index bd8f1c5e56..bd8f1c5e56 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
+++ b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
index 666763fe71..666763fe71 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
+++ b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
index 877ca60c13..877ca60c13 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
+++ b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
index f03d7d6628..f03d7d6628 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
+++ b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java
index d91e206183..a50af074cc 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java
+++ b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java
@@ -1,65 +1,65 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.wsdl.xml;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-import org.junit.Before;
-
-/**
- * Test case for WSDLOperation.
- *
- * @version $Rev$ $Date$
- */
-public abstract class AbstractWSDLTestCase {
-    protected URLArtifactProcessor<Object> documentProcessor;
-    protected ModelResolver resolver;
-    protected WSDLFactory wsdlFactory;
-    protected XSDFactory xsdFactory;
-
-    @Before
-    public void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
-        xsdFactory = modelFactories.getFactory(XSDFactory.class);
-        
-        ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        Contribution contribution = contributionFactory.createContribution();
-        ModelResolverExtensionPoint modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        resolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories);
-        contribution.setModelResolver(resolver);
-        
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
-    }
-
-}
+/*

+ * 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.tuscany.sca.interfacedef.wsdl.xml;

+

+import org.apache.tuscany.sca.contribution.Contribution;

+import org.apache.tuscany.sca.contribution.ContributionFactory;

+import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;

+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;

+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;

+import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;

+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

+import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;

+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

+import org.apache.tuscany.sca.core.ExtensionPointRegistry;

+import org.apache.tuscany.sca.core.FactoryExtensionPoint;

+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;

+import org.apache.tuscany.sca.xsd.XSDFactory;

+import org.junit.Before;

+

+/**

+ * Test case for WSDLOperation.

+ *

+ * @version $Rev: 723274 $ $Date: 2008-12-04 10:14:09 +0000 (Thu, 04 Dec 2008) $

+ */

+public abstract class AbstractWSDLTestCase {

+    protected URLArtifactProcessor<Object> documentProcessor;

+    protected ModelResolver resolver;

+    protected WSDLFactory wsdlFactory;

+    protected XSDFactory xsdFactory;

+

+    @Before

+    public void setUp() throws Exception {

+        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

+        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);

+        wsdlFactory = modelFactories.getFactory(WSDLFactory.class);

+        xsdFactory = modelFactories.getFactory(XSDFactory.class);

+        

+        ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);

+        Contribution contribution = contributionFactory.createContribution();

+        ModelResolverExtensionPoint modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);

+        resolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories);

+        contribution.setModelResolver(resolver);

+        

+        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);

+        documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);

+    }

+

+}

diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
index d2a019f47d..7cebc84af3 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
+++ b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
@@ -1,91 +1,91 @@
-/*
- * 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.tuscany.sca.interfacedef.wsdl.xml;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test reading WSDL interfaces.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadTestCase {
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private CompositeBuilder compositeBuilder;
-
-    @Before
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-        
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
-    }
-
-    @Test
-    public void testReadComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        ComponentType componentType = (ComponentType)staxProcessor.read(reader);
-        assertNotNull(componentType);
-    }
-
-    @Test
-    public void testReadConstrainingType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        ConstrainingType constrainingType = (ConstrainingType)staxProcessor.read(reader);
-        assertNotNull(constrainingType);
-    }
-
-    @Test
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-
-        compositeBuilder.build(composite, null, null);
-    }
-
-}
+/*

+ * 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.tuscany.sca.interfacedef.wsdl.xml;

+

+import static org.junit.Assert.assertNotNull;

+

+import java.io.InputStream;

+

+import javax.xml.stream.XMLInputFactory;

+import javax.xml.stream.XMLStreamReader;

+

+import org.apache.tuscany.sca.assembly.ComponentType;

+import org.apache.tuscany.sca.assembly.Composite;

+import org.apache.tuscany.sca.assembly.ConstrainingType;

+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;

+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;

+import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;

+import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;

+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;

+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

+import org.apache.tuscany.sca.core.FactoryExtensionPoint;

+import org.junit.Before;

+import org.junit.Test;

+

+/**

+ * Test reading WSDL interfaces.

+ * 

+ * @version $Rev: 723270 $ $Date: 2008-12-04 09:48:12 +0000 (Thu, 04 Dec 2008) $

+ */

+public class ReadTestCase {

+

+    private XMLInputFactory inputFactory;

+    private StAXArtifactProcessor<Object> staxProcessor;

+    private CompositeBuilder compositeBuilder;

+

+    @Before

+    public void setUp() throws Exception {

+        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

+        inputFactory = XMLInputFactory.newInstance();

+        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);

+        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);

+        

+        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);

+        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");

+    }

+

+    @Test

+    public void testReadComponentType() throws Exception {

+        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");

+        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);

+        ComponentType componentType = (ComponentType)staxProcessor.read(reader);

+        assertNotNull(componentType);

+    }

+

+    @Test

+    public void testReadConstrainingType() throws Exception {

+        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");

+        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);

+        ConstrainingType constrainingType = (ConstrainingType)staxProcessor.read(reader);

+        assertNotNull(constrainingType);

+    }

+

+    @Test

+    public void testReadComposite() throws Exception {

+        InputStream is = getClass().getResourceAsStream("Calculator.composite");

+        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);

+        Composite composite = (Composite)staxProcessor.read(reader);

+        assertNotNull(composite);

+

+        compositeBuilder.build(composite, null, null);

+    }

+

+}

diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
index 4f85bb8f1c..9b72e0d740 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
+++ b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
@@ -1,67 +1,67 @@
-/*
- * 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.tuscany.sca.interfacedef.wsdl.xml;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import javax.wsdl.Import;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WSDLDocumentProcessorTestCase extends AbstractWSDLTestCase {
-
-    @Test
-    public void testWSDL() throws Exception {
-       
-        URL url = getClass().getResource("/wsdl/helloworld-service.wsdl");
-        WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, URI.create("wsdl/helloworld-service.wsdl"), url);
-        
-        Assert.assertNull(definition.getDefinition());
-        Assert.assertEquals("http://helloworld", definition.getNamespace());
-        URL url1 = getClass().getResource("/wsdl/helloworld-interface.wsdl");
-        WSDLDefinition definition1 = (WSDLDefinition)documentProcessor.read(null, URI.create("wsdl/helloworld-interface.wsdl"), url1);
-        Assert.assertNull(definition1.getDefinition());
-        Assert.assertEquals("http://helloworld", definition1.getNamespace());
-
-        resolver.addModel(definition);
-        resolver.addModel(definition1);
-        resolver.resolveModel(WSDLDefinition.class, definition);
-        resolver.resolveModel(WSDLDefinition.class, definition1);
-        WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, definition);
-        List imports = (List)definition.getDefinition().getImports().get("http://helloworld");
-        Assert.assertNotNull(imports);
-        Assert.assertNotNull(((Import)imports.get(0)).getDefinition());
-        Assert.assertNotNull(resolved.getDefinition().getPortType(new QName("http://helloworld", "HelloWorld")));
-        Assert.assertNotNull(resolved.getDefinition().getService(new QName("http://helloworld", "HelloWorldService")));
-        
-        assertNotNull(resolved.getXmlSchemaType(new QName("http://greeting", "Name")));
-    }
-
-}
+/*

+ * 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.tuscany.sca.interfacedef.wsdl.xml;

+

+import static org.junit.Assert.assertNotNull;

+

+import java.net.URI;

+import java.net.URL;

+import java.util.List;

+

+import javax.wsdl.Import;

+import javax.xml.namespace.QName;

+

+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;

+import org.junit.Assert;

+import org.junit.Test;

+

+/**

+ * @version $Rev: 723274 $ $Date: 2008-12-04 10:14:09 +0000 (Thu, 04 Dec 2008) $

+ */

+public class WSDLDocumentProcessorTestCase extends AbstractWSDLTestCase {

+

+    @Test

+    public void testWSDL() throws Exception {

+       

+        URL url = getClass().getResource("/wsdl/helloworld-service.wsdl");

+        WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, URI.create("wsdl/helloworld-service.wsdl"), url);

+        

+        Assert.assertNull(definition.getDefinition());

+        Assert.assertEquals("http://helloworld", definition.getNamespace());

+        URL url1 = getClass().getResource("/wsdl/helloworld-interface.wsdl");

+        WSDLDefinition definition1 = (WSDLDefinition)documentProcessor.read(null, URI.create("wsdl/helloworld-interface.wsdl"), url1);

+        Assert.assertNull(definition1.getDefinition());

+        Assert.assertEquals("http://helloworld", definition1.getNamespace());

+

+        resolver.addModel(definition);

+        resolver.addModel(definition1);

+        resolver.resolveModel(WSDLDefinition.class, definition);

+        resolver.resolveModel(WSDLDefinition.class, definition1);

+        WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, definition);

+        List imports = (List)definition.getDefinition().getImports().get("http://helloworld");

+        Assert.assertNotNull(imports);

+        Assert.assertNotNull(((Import)imports.get(0)).getDefinition());

+        Assert.assertNotNull(resolved.getDefinition().getPortType(new QName("http://helloworld", "HelloWorld")));

+        Assert.assertNotNull(resolved.getDefinition().getService(new QName("http://helloworld", "HelloWorldService")));

+        

+        assertNotNull(resolved.getXmlSchemaType(new QName("http://greeting", "Name")));

+    }

+

+}

diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
index 6b1f92f372..9009469d23 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
+++ b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
@@ -1,111 +1,111 @@
-/*
- * 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.tuscany.sca.interfacedef.wsdl.xml;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.net.URI;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test reading WSDL interfaces.
- * 
- * @version $Rev$ $Date$
- */
-public class WSDLTestCase {
-
-    private ExtensibleURLArtifactProcessor documentProcessor;
-    private WSDLModelResolver wsdlResolver;
-
-    @Before
-    public void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
-
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        wsdlResolver = new WSDLModelResolver(null, modelFactories);
-    }
-
-    @Test
-    public void testReadWSDLDocument() throws Exception {
-        URL url = getClass().getResource("example.wsdl");
-        WSDLDefinition definition = documentProcessor.read(null, new URI("example.wsdl"), url, WSDLDefinition.class);
-        assertNotNull(definition);
-        assertNull(definition.getDefinition());
-        assertEquals(definition.getNamespace(), "http://www.example.org");
-    }
-
-    @Test
-    public void testReadWSDLImports() throws Exception {
-        QName aBinding = new QName("http://helloworld", "HelloWorldSoapBinding");
-        QName aPortType = new QName("http://helloworld", "HelloWorld");
-
-        URL url = getClass().getResource("test1.wsdl");
-        WSDLDefinition test1Defn = documentProcessor.read(null, new URI("test1.wsdl"), url, WSDLDefinition.class);
-        assertNotNull(test1Defn);
-        wsdlResolver.addModel(test1Defn);
-        test1Defn = wsdlResolver.resolveModel(WSDLDefinition.class, test1Defn);
-        //binding is a part of test1.wsdl
-        assertNotNull(test1Defn.getDefinition().getBinding(aBinding));
-        //porttype is part of test2.wsdl
-        assertNotNull(test1Defn.getDefinition().getPortType(aPortType));
-    }
-
-    @Test
-    public void testReadSameNamespaceWSDLDocument() throws Exception {
-        QName aBinding = new QName("http://helloworld", "HelloWorldSoapBinding");
-        QName aPortType = new QName("http://helloworld", "HelloWorld");
-
-        URL url = getClass().getResource("test2.wsdl");
-        WSDLDefinition test2Defn = documentProcessor.read(null, new URI("test2.wsdl"), url, WSDLDefinition.class);
-        assertNotNull(test2Defn);
-        wsdlResolver.addModel(test2Defn);
-        test2Defn = wsdlResolver.resolveModel(WSDLDefinition.class, test2Defn);
-
-        //bindings are a part of test1.wsdl so should not be found
-        assertNull(test2Defn.getDefinition().getBinding(aBinding));
-        assertNotNull(test2Defn.getDefinition().getPortType(aPortType));
-
-        url = getClass().getResource("test1.wsdl");
-        WSDLDefinition test1Defn = documentProcessor.read(null, new URI("test1.wsdl"), url, WSDLDefinition.class);
-        assertNotNull(test1Defn);
-        wsdlResolver.addModel(test1Defn);
-
-        test1Defn = wsdlResolver.resolveModel(WSDLDefinition.class, test1Defn);
-
-        assertNotNull(test1Defn.getDefinition().getPortType(aPortType));
-        assertNotNull(test1Defn.getDefinition().getBinding(aBinding));
-    }
-
-}
+/*

+ * 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.tuscany.sca.interfacedef.wsdl.xml;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertNull;

+

+import java.net.URI;

+import java.net.URL;

+

+import javax.xml.namespace.QName;

+

+import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;

+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;

+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

+import org.apache.tuscany.sca.core.ExtensionPointRegistry;

+import org.apache.tuscany.sca.core.FactoryExtensionPoint;

+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;

+import org.junit.Before;

+import org.junit.Test;

+

+/**

+ * Test reading WSDL interfaces.

+ * 

+ * @version $Rev: 723270 $ $Date: 2008-12-04 09:48:12 +0000 (Thu, 04 Dec 2008) $

+ */

+public class WSDLTestCase {

+

+    private ExtensibleURLArtifactProcessor documentProcessor;

+    private WSDLModelResolver wsdlResolver;

+

+    @Before

+    public void setUp() throws Exception {

+        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

+        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);

+        documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);

+

+        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);

+        wsdlResolver = new WSDLModelResolver(null, modelFactories);

+    }

+

+    @Test

+    public void testReadWSDLDocument() throws Exception {

+        URL url = getClass().getResource("example.wsdl");

+        WSDLDefinition definition = documentProcessor.read(null, new URI("example.wsdl"), url, WSDLDefinition.class);

+        assertNotNull(definition);

+        assertNull(definition.getDefinition());

+        assertEquals(definition.getNamespace(), "http://www.example.org");

+    }

+

+    @Test

+    public void testReadWSDLImports() throws Exception {

+        QName aBinding = new QName("http://helloworld", "HelloWorldSoapBinding");

+        QName aPortType = new QName("http://helloworld", "HelloWorld");

+

+        URL url = getClass().getResource("test1.wsdl");

+        WSDLDefinition test1Defn = documentProcessor.read(null, new URI("test1.wsdl"), url, WSDLDefinition.class);

+        assertNotNull(test1Defn);

+        wsdlResolver.addModel(test1Defn);

+        test1Defn = wsdlResolver.resolveModel(WSDLDefinition.class, test1Defn);

+        //binding is a part of test1.wsdl

+        assertNotNull(test1Defn.getDefinition().getBinding(aBinding));

+        //porttype is part of test2.wsdl

+        assertNotNull(test1Defn.getDefinition().getPortType(aPortType));

+    }

+

+    @Test

+    public void testReadSameNamespaceWSDLDocument() throws Exception {

+        QName aBinding = new QName("http://helloworld", "HelloWorldSoapBinding");

+        QName aPortType = new QName("http://helloworld", "HelloWorld");

+

+        URL url = getClass().getResource("test2.wsdl");

+        WSDLDefinition test2Defn = documentProcessor.read(null, new URI("test2.wsdl"), url, WSDLDefinition.class);

+        assertNotNull(test2Defn);

+        wsdlResolver.addModel(test2Defn);

+        test2Defn = wsdlResolver.resolveModel(WSDLDefinition.class, test2Defn);

+

+        //bindings are a part of test1.wsdl so should not be found

+        assertNull(test2Defn.getDefinition().getBinding(aBinding));

+        assertNotNull(test2Defn.getDefinition().getPortType(aPortType));

+

+        url = getClass().getResource("test1.wsdl");

+        WSDLDefinition test1Defn = documentProcessor.read(null, new URI("test1.wsdl"), url, WSDLDefinition.class);

+        assertNotNull(test1Defn);

+        wsdlResolver.addModel(test1Defn);

+

+        test1Defn = wsdlResolver.resolveModel(WSDLDefinition.class, test1Defn);

+

+        assertNotNull(test1Defn.getDefinition().getPortType(aPortType));

+        assertNotNull(test1Defn.getDefinition().getBinding(aBinding));

+    }

+

+}

diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
index a11eb1017f..4992013862 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
+++ b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
@@ -1,88 +1,88 @@
-/*
- * 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.tuscany.sca.interfacedef.wsdl.xml;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test reading/write WSDL interfaces.
- * 
- * @version $Rev$ $Date$
- */
-public class WriteTestCase {
-
-    private XMLInputFactory inputFactory;
-    private XMLOutputFactory outputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-
-    @Before
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        outputFactory = XMLOutputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);
-    }
-
-    @Test
-    public void testReadWriteComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
-        ComponentType componentType = (ComponentType)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(componentType);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos));
-    }
-
-    @Test
-    public void testReadWriteConstrainingType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
-        ConstrainingType constrainingType = (ConstrainingType)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(constrainingType);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(constrainingType, outputFactory.createXMLStreamWriter(bos));
-    }
-
-    @Test
-    public void testReadWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(composite);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
-    }
-
-}
+/*

+ * 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.tuscany.sca.interfacedef.wsdl.xml;

+

+import static org.junit.Assert.assertNotNull;

+

+import java.io.ByteArrayOutputStream;

+import java.io.InputStream;

+

+import javax.xml.stream.XMLInputFactory;

+import javax.xml.stream.XMLOutputFactory;

+

+import org.apache.tuscany.sca.assembly.ComponentType;

+import org.apache.tuscany.sca.assembly.Composite;

+import org.apache.tuscany.sca.assembly.ConstrainingType;

+import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;

+import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;

+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;

+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

+import org.junit.Before;

+import org.junit.Test;

+

+/**

+ * Test reading/write WSDL interfaces.

+ * 

+ * @version $Rev: 723270 $ $Date: 2008-12-04 09:48:12 +0000 (Thu, 04 Dec 2008) $

+ */

+public class WriteTestCase {

+

+    private XMLInputFactory inputFactory;

+    private XMLOutputFactory outputFactory;

+    private StAXArtifactProcessor<Object> staxProcessor;

+

+    @Before

+    public void setUp() throws Exception {

+        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

+        inputFactory = XMLInputFactory.newInstance();

+        outputFactory = XMLOutputFactory.newInstance();

+        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);

+        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);

+    }

+

+    @Test

+    public void testReadWriteComponentType() throws Exception {

+        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");

+        ComponentType componentType = (ComponentType)staxProcessor.read(inputFactory.createXMLStreamReader(is));

+        assertNotNull(componentType);

+        ByteArrayOutputStream bos = new ByteArrayOutputStream();

+        staxProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos));

+    }

+

+    @Test

+    public void testReadWriteConstrainingType() throws Exception {

+        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");

+        ConstrainingType constrainingType = (ConstrainingType)staxProcessor.read(inputFactory.createXMLStreamReader(is));

+        assertNotNull(constrainingType);

+        ByteArrayOutputStream bos = new ByteArrayOutputStream();

+        staxProcessor.write(constrainingType, outputFactory.createXMLStreamWriter(bos));

+    }

+

+    @Test

+    public void testReadWriteComposite() throws Exception {

+        InputStream is = getClass().getResourceAsStream("Calculator.composite");

+        Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is));

+        assertNotNull(composite);

+        ByteArrayOutputStream bos = new ByteArrayOutputStream();

+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));

+    }

+

+}

diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
index 4558bafdb8..1efeb6a514 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
+++ b/java/sca/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
@@ -1,52 +1,52 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.wsdl.xml;
-
-import java.net.URL;
-
-import javax.xml.stream.XMLInputFactory;
-
-import org.apache.tuscany.sca.xsd.xml.XMLDocumentHelper;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XMLDocumentHelperTestCase {
-    private URL wsdl;
-    private URL xsd;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Before
-    public void setUp() throws Exception {
-        wsdl = getClass().getResource("/wsdl/helloworld-interface.wsdl");
-    }
-
-    @Test
-    public void testReadTNS() throws Exception {
-        String tns = XMLDocumentHelper.readTargetNamespace(wsdl, XMLDocumentHelper.WSDL11, true, "targetNamespace", XMLInputFactory.newInstance());
-        Assert.assertEquals("http://helloworld", tns);
-    }
-
-}
+/*

+ * 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.tuscany.sca.interfacedef.wsdl.xml;

+

+import java.net.URL;

+

+import javax.xml.stream.XMLInputFactory;

+

+import org.apache.tuscany.sca.xsd.xml.XMLDocumentHelper;

+import org.junit.Assert;

+import org.junit.Before;

+import org.junit.Test;

+

+/**

+ * @version $Rev: 723274 $ $Date: 2008-12-04 10:14:09 +0000 (Thu, 04 Dec 2008) $

+ */

+public class XMLDocumentHelperTestCase {

+    private URL wsdl;

+    private URL xsd;

+

+    /**

+     * @throws java.lang.Exception

+     */

+    @Before

+    public void setUp() throws Exception {

+        wsdl = getClass().getResource("/wsdl/helloworld-interface.wsdl");

+    }

+

+    @Test

+    public void testReadTNS() throws Exception {

+        String tns = XMLDocumentHelper.readTargetNamespace(wsdl, XMLDocumentHelper.WSDL11, true, "targetNamespace", XMLInputFactory.newInstance());

+        Assert.assertEquals("http://helloworld", tns);

+    }

+

+}

diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
index fcdf69594b..98ffd37232 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
+++ b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
@@ -1,55 +1,55 @@
-<?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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:calc="http://sample.calculator"
-	targetNamespace="http://calc"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"
-        	wsdli:wsdlLocation="http://tempuri.org"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-</composite>
+<?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.    

+-->

+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+	xmlns:calc="http://sample.calculator"

+	targetNamespace="http://calc"

+	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"

+	name="Calculator">

+

+    <service name="CalculatorService" promote="CalculatorServiceComponent">

+        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"

+        	wsdli:wsdlLocation="http://tempuri.org"/>

+    </service>

+

+    <component name="CalculatorServiceComponent">

+		<implementation.java class="calculator.CalculatorServiceImpl"/>

+        <reference name="addService" target="AddServiceComponent"/>

+        <reference name="subtractService" target="SubtractServiceComponent"/>

+        <reference name="multiplyService" target="MultiplyServiceComponent"/>

+        <reference name="divideService" target="DivideServiceComponent"/>

+    </component>

+

+    <component name="AddServiceComponent">

+        <implementation.java class="calculator.AddServiceImpl"/>

+    </component>

+

+    <component name="SubtractServiceComponent">

+        <implementation.java class="calculator.SubtractServiceImpl"/>

+    </component>

+

+    <component name="MultiplyServiceComponent">

+        <implementation.java class="calculator.MultiplyServiceImpl"/>

+    </component>

+

+    <component name="DivideServiceComponent">

+        <implementation.java class="calculator.DivideServiceImpl"/>

+    </component>

+

+</composite>

diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
index 5e6ae68e11..5e6ae68e11 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
+++ b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
index 35052dfd6d..2abafd96f8 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
+++ b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance">
-
-  <service name="CalculatorService">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"
-        	wsdli:wsdlLocation="http://tempuri.org"/>
-  </service>
-
-  <reference name="divideService">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Divide)"/>
-  </reference>  
-
-</componentType>              
+<?xml version="1.0" encoding="ASCII"?>

+<!--

+ * 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.

+-->

+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance">

+

+  <service name="CalculatorService">

+        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"

+        	wsdli:wsdlLocation="http://tempuri.org"/>

+  </service>

+

+  <reference name="divideService">

+        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Divide)"/>

+  </reference>  

+

+</componentType>              

        
\ No newline at end of file
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
index 5e8e5dad0d..747bb0b76d 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
+++ b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
@@ -1,26 +1,26 @@
-<?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 targetNamespace="http://www.example.org"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  name="example">
-
-    <wsdl:portType name="HelloWorld">
-    </wsdl:portType>
-</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 targetNamespace="http://www.example.org"

+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

+                  name="example">

+

+    <wsdl:portType name="HelloWorld">

+    </wsdl:portType>

+</wsdl:definitions>

diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
index ad81fc7867..a08a546424 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
+++ b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<definitions name="StockQuote" targetNamespace="http://example.com/stockquote.wsdl"
-    xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd1="http://example.com/stockquote.xsd"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="getLastTradePrice1">
-                <complexType>
-                    <sequence>
-                        <element name="tickerSymbol" type="string" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="getLastTradePriceResponse">
-                <complexType>
-                    <sequence>
-                        <element name="price" type="float" />
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="GetLastTradePriceInput">
-        <part name="body" element="xsd1:getLastTradePrice" />
-    </message>
-
-    <message name="GetLastTradePriceOutput">
-        <part name="body" element="xsd1:getLastTradePriceResponse" />
-    </message>
-
-    <portType name="StockQuotePortType">
-        <operation name="getLastTradePrice">
-            <input message="tns:GetLastTradePriceInput" />
-            <output message="tns:GetLastTradePriceOutput" />
-        </operation>
-    </portType>
-
+<?xml version="1.0"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<definitions name="StockQuote" targetNamespace="http://example.com/stockquote.wsdl"

+    xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd1="http://example.com/stockquote.xsd"

+    xmlns="http://schemas.xmlsoap.org/wsdl/">

+

+    <types>

+        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">

+            <element name="getLastTradePrice1">

+                <complexType>

+                    <sequence>

+                        <element name="tickerSymbol" type="string" />

+                    </sequence>

+                </complexType>

+            </element>

+            <element name="getLastTradePriceResponse">

+                <complexType>

+                    <sequence>

+                        <element name="price" type="float" />

+                    </sequence>

+                </complexType>

+            </element>

+        </schema>

+    </types>

+

+    <message name="GetLastTradePriceInput">

+        <part name="body" element="xsd1:getLastTradePrice" />

+    </message>

+

+    <message name="GetLastTradePriceOutput">

+        <part name="body" element="xsd1:getLastTradePriceResponse" />

+    </message>

+

+    <portType name="StockQuotePortType">

+        <operation name="getLastTradePrice">

+            <input message="tns:GetLastTradePriceInput" />

+            <output message="tns:GetLastTradePriceOutput" />

+        </operation>

+    </portType>

+

 </definitions>
\ No newline at end of file
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
index 241ec15d36..db1b693448 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
+++ b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
@@ -1,136 +1,136 @@
-<!--
- * 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.    
--->
-<schema targetNamespace="http://www.example.com/IPO"
-	xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:ipo="http://www.example.com/IPO">
-
-	<annotation>
-		<documentation xml:lang="en">
-			International Purchase order schema for Example.com
-			Copyright 2000 Example.com. All rights reserved.
-		</documentation>
-	</annotation>
-
-
-	<element name="purchaseOrder" type="ipo:PurchaseOrderType" />
-
-	<element name="comment" type="string" />
-
-	<complexType name="PurchaseOrderType">
-		<sequence>
-			<element name="shipTo" type="ipo:Address" />
-			<element name="billTo" type="ipo:Address" />
-			<element ref="ipo:comment" minOccurs="0" />
-			<element name="items" type="ipo:Items" />
-		</sequence>
-		<attribute name="orderDate" type="date" />
-	</complexType>
-
-	<complexType name="Items">
-		<sequence>
-			<element name="item" minOccurs="0" maxOccurs="unbounded">
-				<complexType>
-					<sequence>
-						<element name="productName" type="string" />
-						<element name="quantity">
-							<simpleType>
-								<restriction base="positiveInteger">
-									<maxExclusive value="100" />
-								</restriction>
-							</simpleType>
-						</element>
-						<element name="USPrice" type="decimal" />
-						<element ref="ipo:comment" minOccurs="0" />
-						<element name="shipDate" type="date"
-							minOccurs="0" />
-					</sequence>
-					<attribute name="partNum" type="ipo:SKU"
-						use="required" />
-				</complexType>
-			</element>
-		</sequence>
-	</complexType>
-
-	<simpleType name="SKU">
-		<restriction base="string">
-			<pattern value="\d{3}-[A-Z]{2}" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="Address">
-		<sequence>
-			<element name="name" type="string" />
-			<element name="street" type="string" />
-			<element name="city" type="string" />
-		</sequence>
-	</complexType>
-
-	<complexType name="USAddress">
-		<complexContent>
-			<extension base="ipo:Address">
-				<sequence>
-					<element name="state" type="ipo:USState" />
-					<element name="zip" type="positiveInteger" />
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="UKAddress">
-		<complexContent>
-			<extension base="ipo:Address">
-				<sequence>
-					<element name="postcode" type="ipo:UKPostcode" />
-				</sequence>
-				<attribute name="exportCode" type="positiveInteger"
-					fixed="1" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<!-- other Address derivations for more countries -->
-
-	<simpleType name="USState">
-		<restriction base="string">
-			<enumeration value="AK" />
-			<enumeration value="AL" />
-			<enumeration value="AR" />
-			<enumeration value="CA" />
-			<enumeration value="PA" />
-			<!-- and so on ... -->
-		</restriction>
-	</simpleType>
-
-	<simpleType name="Postcode">
-		<restriction base="string">
-			<length value="7" fixed="true" />
-		</restriction>
-	</simpleType>
-
-
-	<simpleType name="UKPostcode">
-		<restriction base="ipo:Postcode">
-			<pattern value="[A-Z]{2}\d\s\d[A-Z]{2}" />
-		</restriction>
-	</simpleType>
-
-
-
-</schema>
-
+<!--

+ * 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.    

+-->

+<schema targetNamespace="http://www.example.com/IPO"

+	xmlns="http://www.w3.org/2001/XMLSchema"

+	xmlns:ipo="http://www.example.com/IPO">

+

+	<annotation>

+		<documentation xml:lang="en">

+			International Purchase order schema for Example.com

+			Copyright 2000 Example.com. All rights reserved.

+		</documentation>

+	</annotation>

+

+

+	<element name="purchaseOrder" type="ipo:PurchaseOrderType" />

+

+	<element name="comment" type="string" />

+

+	<complexType name="PurchaseOrderType">

+		<sequence>

+			<element name="shipTo" type="ipo:Address" />

+			<element name="billTo" type="ipo:Address" />

+			<element ref="ipo:comment" minOccurs="0" />

+			<element name="items" type="ipo:Items" />

+		</sequence>

+		<attribute name="orderDate" type="date" />

+	</complexType>

+

+	<complexType name="Items">

+		<sequence>

+			<element name="item" minOccurs="0" maxOccurs="unbounded">

+				<complexType>

+					<sequence>

+						<element name="productName" type="string" />

+						<element name="quantity">

+							<simpleType>

+								<restriction base="positiveInteger">

+									<maxExclusive value="100" />

+								</restriction>

+							</simpleType>

+						</element>

+						<element name="USPrice" type="decimal" />

+						<element ref="ipo:comment" minOccurs="0" />

+						<element name="shipDate" type="date"

+							minOccurs="0" />

+					</sequence>

+					<attribute name="partNum" type="ipo:SKU"

+						use="required" />

+				</complexType>

+			</element>

+		</sequence>

+	</complexType>

+

+	<simpleType name="SKU">

+		<restriction base="string">

+			<pattern value="\d{3}-[A-Z]{2}" />

+		</restriction>

+	</simpleType>

+

+	<complexType name="Address">

+		<sequence>

+			<element name="name" type="string" />

+			<element name="street" type="string" />

+			<element name="city" type="string" />

+		</sequence>

+	</complexType>

+

+	<complexType name="USAddress">

+		<complexContent>

+			<extension base="ipo:Address">

+				<sequence>

+					<element name="state" type="ipo:USState" />

+					<element name="zip" type="positiveInteger" />

+				</sequence>

+			</extension>

+		</complexContent>

+	</complexType>

+

+	<complexType name="UKAddress">

+		<complexContent>

+			<extension base="ipo:Address">

+				<sequence>

+					<element name="postcode" type="ipo:UKPostcode" />

+				</sequence>

+				<attribute name="exportCode" type="positiveInteger"

+					fixed="1" />

+			</extension>

+		</complexContent>

+	</complexType>

+

+	<!-- other Address derivations for more countries -->

+

+	<simpleType name="USState">

+		<restriction base="string">

+			<enumeration value="AK" />

+			<enumeration value="AL" />

+			<enumeration value="AR" />

+			<enumeration value="CA" />

+			<enumeration value="PA" />

+			<!-- and so on ... -->

+		</restriction>

+	</simpleType>

+

+	<simpleType name="Postcode">

+		<restriction base="string">

+			<length value="7" fixed="true" />

+		</restriction>

+	</simpleType>

+

+

+	<simpleType name="UKPostcode">

+		<restriction base="ipo:Postcode">

+			<pattern value="[A-Z]{2}\d\s\d[A-Z]{2}" />

+		</restriction>

+	</simpleType>

+

+

+

+</schema>

+

diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
index 39cd5547d9..466ceb23da 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
+++ b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<definitions name="StockQuote" targetNamespace="http://example.com/stockquote.wsdl"
-    xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd1="http://example.com/stockquote.xsd"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="getLastTradePrice">
-                <complexType>
-                    <sequence>
-                        <element name="tickerSymbol" type="string" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="getLastTradePriceResponse">
-                <complexType>
-                    <sequence>
-                        <element name="price" type="float" />
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="GetLastTradePriceInput">
-        <part name="body" element="xsd1:getLastTradePrice" />
-    </message>
-
-    <message name="GetLastTradePriceOutput">
-        <part name="body" element="xsd1:getLastTradePriceResponse" />
-    </message>
-
-    <portType name="StockQuotePortType">
-        <operation name="getLastTradePrice">
-            <input message="tns:GetLastTradePriceInput" />
-            <output message="tns:GetLastTradePriceOutput" />
-        </operation>
-    </portType>
-
+<?xml version="1.0"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<definitions name="StockQuote" targetNamespace="http://example.com/stockquote.wsdl"

+    xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd1="http://example.com/stockquote.xsd"

+    xmlns="http://schemas.xmlsoap.org/wsdl/">

+

+    <types>

+        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">

+            <element name="getLastTradePrice">

+                <complexType>

+                    <sequence>

+                        <element name="tickerSymbol" type="string" />

+                    </sequence>

+                </complexType>

+            </element>

+            <element name="getLastTradePriceResponse">

+                <complexType>

+                    <sequence>

+                        <element name="price" type="float" />

+                    </sequence>

+                </complexType>

+            </element>

+        </schema>

+    </types>

+

+    <message name="GetLastTradePriceInput">

+        <part name="body" element="xsd1:getLastTradePrice" />

+    </message>

+

+    <message name="GetLastTradePriceOutput">

+        <part name="body" element="xsd1:getLastTradePriceResponse" />

+    </message>

+

+    <portType name="StockQuotePortType">

+        <operation name="getLastTradePrice">

+            <input message="tns:GetLastTradePriceInput" />

+            <output message="tns:GetLastTradePriceOutput" />

+        </operation>

+    </portType>

+

 </definitions>
\ No newline at end of file
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
index 8e26f7b4b5..d39956af0a 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
+++ b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
@@ -1,45 +1,45 @@
-<?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 targetNamespace="http://helloworld" xmlns:tns="http://helloworld"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
-
-    <wsdl:import location="test2.wsdl" namespace="http://helloworld"></wsdl:import>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/sample-helloworldws-1.0-SNAPSHOT/services/HelloWorldWebService" />
-        </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 targetNamespace="http://helloworld" xmlns:tns="http://helloworld"

+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">

+

+    <wsdl:import location="test2.wsdl" namespace="http://helloworld"></wsdl:import>

+

+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

+        <wsdl:operation name="getGreetings">

+            <wsdlsoap:operation soapAction="" />

+            <wsdl:input name="getGreetingsRequest">

+                <wsdlsoap:body use="literal" />

+            </wsdl:input>

+            <wsdl:output name="getGreetingsResponse">

+                <wsdlsoap:body use="literal" />

+            </wsdl:output>

+        </wsdl:operation>

+    </wsdl:binding>

+

+    <wsdl:service name="HelloWorldService">

+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

+            <wsdlsoap:address location="http://localhost:8085/sample-helloworldws-1.0-SNAPSHOT/services/HelloWorldWebService" />

+        </wsdl:port>

+    </wsdl:service>

+

+</wsdl:definitions>

diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
index c2210f4a94..f3dbda1051 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
+++ b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
@@ -1,33 +1,33 @@
-<!--
- * 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.    
--->
-<schema targetNamespace="http://www.example.com/Customer" xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:ipo="http://www.example.com/IPO" xmlns:tns="http://www.example.com/Customer">
-    <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd" />
-
-    <complexType name="Customer">
-        <sequence>
-            <element name="customerID" type="string"></element>
-            <element name="name" type="string"></element>
-            <element name="order" type="ipo:PurchaseOrderType" />
-        </sequence>
-    </complexType>
-    <element name="customer" type="tns:Customer"></element>
-
-</schema>
-
+<!--

+ * 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.    

+-->

+<schema targetNamespace="http://www.example.com/Customer" xmlns="http://www.w3.org/2001/XMLSchema"

+    xmlns:ipo="http://www.example.com/IPO" xmlns:tns="http://www.example.com/Customer">

+    <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd" />

+

+    <complexType name="Customer">

+        <sequence>

+            <element name="customerID" type="string"></element>

+            <element name="name" type="string"></element>

+            <element name="order" type="ipo:PurchaseOrderType" />

+        </sequence>

+    </complexType>

+    <element name="customer" type="tns:Customer"></element>

+

+</schema>

+

diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
index 529b395fd5..0cd6819841 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
+++ b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
@@ -1,63 +1,63 @@
-<?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 targetNamespace="http://helloworld" xmlns:tns="http://helloworld"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd" />
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string" />
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string" />
-                    </sequence>
-                </complexType>
-            </element>
-
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest" />
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse" />
-        </wsdl:operation>
-    </wsdl:portType>
-
-</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 targetNamespace="http://helloworld" xmlns:tns="http://helloworld"

+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">

+

+    <wsdl:types>

+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">

+

+            <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd" />

+

+            <element name="getGreetings">

+                <complexType>

+                    <sequence>

+                        <element name="name" type="xsd:string" />

+                    </sequence>

+                </complexType>

+            </element>

+

+            <element name="getGreetingsResponse">

+                <complexType>

+                    <sequence>

+                        <element name="getGreetingsReturn" type="xsd:string" />

+                    </sequence>

+                </complexType>

+            </element>

+

+        </schema>

+    </wsdl:types>

+

+    <wsdl:message name="getGreetingsRequest">

+        <wsdl:part element="tns:getGreetings" name="parameters" />

+    </wsdl:message>

+

+    <wsdl:message name="getGreetingsResponse">

+        <wsdl:part element="tns:getGreetingsResponse" name="parameters" />

+    </wsdl:message>

+

+    <wsdl:portType name="HelloWorld">

+        <wsdl:operation name="getGreetings">

+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest" />

+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse" />

+        </wsdl:operation>

+    </wsdl:portType>

+

+</wsdl:definitions>

diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
index 666a7e4069..b7beeed46d 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
+++ b/java/sca/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
@@ -1,76 +1,76 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<definitions name="StockQuote" targetNamespace="http://example.com/stockquote.wsdl"
-    xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd1="http://example.com/stockquote.xsd"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="getLastTradePrice">
-                <complexType>
-                    <sequence>
-                        <element name="tickerSymbol" type="string" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="getLastTradePriceResponse">
-                <complexType>
-                    <sequence>
-                        <element name="price" type="float" />
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="GetLastTradePriceInput1">
-        <part name="body" element="xsd1:getLastTradePrice" />
-    </message>
-
-    <message name="GetLastTradePriceOutput1">
-        <part name="body" element="xsd1:getLastTradePriceResponse" />
-    </message>
-
-    <message name="GetLastTradePriceInput2">
-        <part name="body" element="xsd1:getLastTradePrice" />
-        <part name="other" type="xsd:string"/>
-    </message>
-
-    <message name="GetLastTradePriceOutput2">
-        <part name="body" element="xsd1:getLastTradePriceResponse" />
-    </message>
-    
-    <portType name="StockQuotePortType">
-        <operation name="getLastTradePrice">
-            <input message="tns:GetLastTradePriceInput1" />
-            <output message="tns:GetLastTradePriceOutput1" />
-        </operation>
-        <operation name="getLastTradePrice1">
-            <input message="tns:GetLastTradePriceInput1" />
-            <output message="tns:GetLastTradePriceOutput1" />
-        </operation>
-        <operation name="getLastTradePrice2">
-            <input message="tns:GetLastTradePriceInput2" />
-            <output message="tns:GetLastTradePriceOutput2" />
-        </operation>
-    </portType>
-
+<?xml version="1.0"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<definitions name="StockQuote" targetNamespace="http://example.com/stockquote.wsdl"

+    xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd1="http://example.com/stockquote.xsd"

+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"

+    xmlns="http://schemas.xmlsoap.org/wsdl/">

+

+    <types>

+        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">

+            <element name="getLastTradePrice">

+                <complexType>

+                    <sequence>

+                        <element name="tickerSymbol" type="string" />

+                    </sequence>

+                </complexType>

+            </element>

+            <element name="getLastTradePriceResponse">

+                <complexType>

+                    <sequence>

+                        <element name="price" type="float" />

+                    </sequence>

+                </complexType>

+            </element>

+        </schema>

+    </types>

+

+    <message name="GetLastTradePriceInput1">

+        <part name="body" element="xsd1:getLastTradePrice" />

+    </message>

+

+    <message name="GetLastTradePriceOutput1">

+        <part name="body" element="xsd1:getLastTradePriceResponse" />

+    </message>

+

+    <message name="GetLastTradePriceInput2">

+        <part name="body" element="xsd1:getLastTradePrice" />

+        <part name="other" type="xsd:string"/>

+    </message>

+

+    <message name="GetLastTradePriceOutput2">

+        <part name="body" element="xsd1:getLastTradePriceResponse" />

+    </message>

+    

+    <portType name="StockQuotePortType">

+        <operation name="getLastTradePrice">

+            <input message="tns:GetLastTradePriceInput1" />

+            <output message="tns:GetLastTradePriceOutput1" />

+        </operation>

+        <operation name="getLastTradePrice1">

+            <input message="tns:GetLastTradePriceInput1" />

+            <output message="tns:GetLastTradePriceOutput1" />

+        </operation>

+        <operation name="getLastTradePrice2">

+            <input message="tns:GetLastTradePriceInput2" />

+            <output message="tns:GetLastTradePriceOutput2" />

+        </operation>

+    </portType>

+

 </definitions>
\ No newline at end of file
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl b/java/sca/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl
index 813d9e8291..b265831509 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
+++ b/java/sca/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl
@@ -1,62 +1,62 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<definitions name="StockQuote" 
-    targetNamespace="http://example.com/stockquote.wsdl"
-    xmlns:tns="http://example.com/stockquote.wsdl" 
-    xmlns:xsd="http://example.com/stockquote.xsd"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="getLastTradePrice">
-                <complexType>
-                    <sequence>
-                        <element name="tickerSymbol" type="string" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="getLastTradePriceResponse">
-                <complexType>
-                    <sequence>
-                        <element name="price" type="float" />
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="GetLastTradePriceInput">
-        <part name="body" element="xsd:getLastTradePrice" />
-    </message>
-
-    <message name="GetLastTradePriceOutput">
-        <part name="body" element="xsd:getLastTradePriceResponse" />
-    </message>
-
-    <portType name="StockQuotePortType" sca:requires="sca:conversational tns:PolicyIntent">
-        <operation name="getLastTradePrice">
-            <input message="tns:GetLastTradePriceInput" />
-            <output message="tns:GetLastTradePriceOutput" />
-        </operation>
-        <operation name="cancel" sca:endsConversation="true"/>
-    </portType>
-
+<?xml version="1.0"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<definitions name="StockQuote" 

+    targetNamespace="http://example.com/stockquote.wsdl"

+    xmlns:tns="http://example.com/stockquote.wsdl" 

+    xmlns:xsd="http://example.com/stockquote.xsd"

+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+    xmlns="http://schemas.xmlsoap.org/wsdl/">

+

+    <types>

+        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">

+            <element name="getLastTradePrice">

+                <complexType>

+                    <sequence>

+                        <element name="tickerSymbol" type="string" />

+                    </sequence>

+                </complexType>

+            </element>

+            <element name="getLastTradePriceResponse">

+                <complexType>

+                    <sequence>

+                        <element name="price" type="float" />

+                    </sequence>

+                </complexType>

+            </element>

+        </schema>

+    </types>

+

+    <message name="GetLastTradePriceInput">

+        <part name="body" element="xsd:getLastTradePrice" />

+    </message>

+

+    <message name="GetLastTradePriceOutput">

+        <part name="body" element="xsd:getLastTradePriceResponse" />

+    </message>

+

+    <portType name="StockQuotePortType" sca:requires="sca:conversational tns:PolicyIntent">

+        <operation name="getLastTradePrice">

+            <input message="tns:GetLastTradePriceInput" />

+            <output message="tns:GetLastTradePriceOutput" />

+        </operation>

+        <operation name="cancel" sca:endsConversation="true"/>

+    </portType>

+

 </definitions>
\ No newline at end of file
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl b/java/sca/modules/interface-wsdl/src/test/resources/wsdl/helloworld-interface.wsdl
index b0b6644e7f..b0b6644e7f 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
+++ b/java/sca/modules/interface-wsdl/src/test/resources/wsdl/helloworld-interface.wsdl
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl b/java/sca/modules/interface-wsdl/src/test/resources/wsdl/helloworld-service.wsdl
index 0a7979e308..0a7979e308 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
+++ b/java/sca/modules/interface-wsdl/src/test/resources/wsdl/helloworld-service.wsdl
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd b/java/sca/modules/interface-wsdl/src/test/resources/xsd/greeting.xsd
index 635ca25bfc..160749bb18 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
+++ b/java/sca/modules/interface-wsdl/src/test/resources/xsd/greeting.xsd
@@ -1,29 +1,29 @@
-<?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.
--->
-<schema targetNamespace="http://greeting" xmlns="http://www.w3.org/2001/XMLSchema">
-    <include schemaLocation="name.xsd" />
-    <complexType name="Greeting">
-        <sequence>
-            <element name="message" type="string" />
-            <element name="name" type="Name" />
-        </sequence>
-    </complexType>
-
+<?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.

+-->

+<schema targetNamespace="http://greeting" xmlns="http://www.w3.org/2001/XMLSchema">

+    <include schemaLocation="name.xsd" />

+    <complexType name="Greeting">

+        <sequence>

+            <element name="message" type="string" />

+            <element name="name" type="Name" />

+        </sequence>

+    </complexType>

+

 </schema>
\ No newline at end of file
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd b/java/sca/modules/interface-wsdl/src/test/resources/xsd/helloworld.xsd
index bb0c9bc7b7..e1f00fe0d5 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
+++ b/java/sca/modules/interface-wsdl/src/test/resources/xsd/helloworld.xsd
@@ -1,22 +1,22 @@
-<?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.
--->
-<schema targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-    <import namespace="http://greeting" schemaLocation="greeting.xsd" />
+<?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.

+-->

+<schema targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">

+    <import namespace="http://greeting" schemaLocation="greeting.xsd" />

 </schema>
\ No newline at end of file
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd b/java/sca/modules/interface-wsdl/src/test/resources/xsd/name.xsd
index 300de931ec..aed784c2f5 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
+++ b/java/sca/modules/interface-wsdl/src/test/resources/xsd/name.xsd
@@ -1,29 +1,29 @@
-<?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.
--->
-<schema targetNamespace="http://greeting" xmlns="http://www.w3.org/2001/XMLSchema">
-
-    <complexType name="Name">
-        <sequence>
-            <element name="firstName" type="string" />
-            <element name="lastName" type="string" />
-        </sequence>
-    </complexType>
-
+<?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.

+-->

+<schema targetNamespace="http://greeting" xmlns="http://www.w3.org/2001/XMLSchema">

+

+    <complexType name="Name">

+        <sequence>

+            <element name="firstName" type="string" />

+            <element name="lastName" type="string" />

+        </sequence>

+    </complexType>

+

 </schema>
\ No newline at end of file
diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml
index b042bb9e23..7f6dcab735 100644
--- a/java/sca/modules/pom.xml
+++ b/java/sca/modules/pom.xml
@@ -80,7 +80,6 @@
         <module>interface-java-jaxws</module>
         <module>interface-java-xml</module>
         <module>interface-wsdl</module>
-        <module>interface-wsdl-xml</module>
         <module>launcher</module>
         <module>monitor</module>
         <module>myfaces</module>