You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by hu...@apache.org on 2006/07/07 15:39:52 UTC

svn commit: r419889 [1/2] - in /incubator/woden/branches/WODEN-40: ant-test/ src/org/apache/woden/ src/org/apache/woden/ant/ src/org/apache/woden/internal/ src/org/apache/woden/internal/util/ src/org/apache/woden/internal/wsdl20/extensions/http/ src/or...

Author: hughesj
Date: Fri Jul  7 06:39:51 2006
New Revision: 419889

URL: http://svn.apache.org/viewvc?rev=419889&view=rev
Log:
Merged https://svn.apache.org/...../woden/java (a.k.a. trunk) changes r419005:419883 into the WODEN-40 branch

Added:
    incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/CmBaseWriter.java
      - copied unchanged from r419887, incubator/woden/java/src/org/apache/woden/ant/CmBaseWriter.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/CmExtensionsWriter.java
      - copied unchanged from r419887, incubator/woden/java/src/org/apache/woden/ant/CmExtensionsWriter.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/CmHttpWriter.java
      - copied unchanged from r419887, incubator/woden/java/src/org/apache/woden/ant/CmHttpWriter.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/CmRpcWriter.java
      - copied unchanged from r419887, incubator/woden/java/src/org/apache/woden/ant/CmRpcWriter.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/CmSoapWriter.java
      - copied unchanged from r419887, incubator/woden/java/src/org/apache/woden/ant/CmSoapWriter.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/CmWriter.java
      - copied unchanged from r419887, incubator/woden/java/src/org/apache/woden/ant/CmWriter.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/NamespaceWriter.java
      - copied unchanged from r419887, incubator/woden/java/src/org/apache/woden/ant/NamespaceWriter.java
Modified:
    incubator/woden/branches/WODEN-40/ant-test/build.xml
    incubator/woden/branches/WODEN-40/ant-test/documents-bad-report.xml
    incubator/woden/branches/WODEN-40/ant-test/documents-good-report.xml
    incubator/woden/branches/WODEN-40/ant-test/test-suite-results.zip
    incubator/woden/branches/WODEN-40/src/org/apache/woden/ErrorLocator.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/Report.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/WsdlCm.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/XMLWriter.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/ErrorLocatorImpl.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/util/ComponentModelBuilder.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingOperationExtensionsImpl.java
    incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/extensions/rpc/RPCConstants.java
    incubator/woden/branches/WODEN-40/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java

Modified: incubator/woden/branches/WODEN-40/ant-test/build.xml
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/ant-test/build.xml?rev=419889&r1=419888&r2=419889&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/ant-test/build.xml (original)
+++ incubator/woden/branches/WODEN-40/ant-test/build.xml Fri Jul  7 06:39:51 2006
@@ -25,7 +25,7 @@
 	<property name="desc.dir" location="${woden.dir}/../desc" />
 	<property name="test-suite.dir" location="${desc.dir}/test-suite" />
 	<property name="xsd.dir" location="${test-suite.dir}/interchange" />
-	<property name="xmlcatalog.dir" location="${test-suite.dir}/xmlcatalog"/>
+	<property name="xmlcatalog.dir" location="${test-suite.dir}/xmlcatalog" />
 
 
 	<taskdef name="validatewsdl20" classname="org.apache.woden.ant.ValidateWSDL20" classpath="${lib.dir}/woden.jar;${lib.dir}/woden-ant.jar;${downloads.lib.dir}/${XmlSchemaFile};${downloads.lib.dir}/${XercesJar1};${downloads.lib.dir}/${XercesJar2}" />
@@ -33,37 +33,57 @@
 	<target name="main" description="---> Validate test suite, generates interchange format, and validates results" depends="documents-good, documents-bad, schemavalidate-results" />
 
 	<target name="documents-good" description="---> Validates W3C WSDL 2.0 good document test suite and outputs component model">
-			<mkdir dir="results" />
-			<validatewsdl20 dir="${test-suite.dir}/documents/good" includes="**/*.wsdl" cm="yes" cmdir="results" report="documents-good-report.xml" />
-			<zip destfile="test-suite-results.zip" basedir="results" />
-		</target>
-
-		<target name="documents-bad" description="---> Validates W3C WSDL 2.0 bad document test suite and outputs report">
-			<validatewsdl20 dir="${test-suite.dir}/documents/bad" includes="**/*.wsdl" cm="no" report="documents-bad-report.xml" />
-		</target>
-
-		<target name="schemavalidate-results" description="---> Validates component model interchange format results againt schema.">
-			<schemavalidate failonerror="no">
-				<schema namespace="http://www.w3.org/XML/1998/namespace" file="${xsd.dir}/xml.xsd" />
-				<schema namespace="http://www.w3.org/2002/ws/desc/wsdl/component" file="${xsd.dir}/wsdlcm.xsd" />
-				<schema namespace="http://www.w3.org/2002/ws/desc/wsdl/component-base" file="${xsd.dir}/wsdlcm-base.xsd" />
-				<schema namespace="http://www.w3.org/2002/ws/desc/wsdl/component-extensions" file="${xsd.dir}/wsdlcm-extensions.xsd" />
-				<schema namespace="http://www.w3.org/2002/ws/desc/wsdl/component-http" file="${xsd.dir}/wsdlcm-http.xsd" />
-				<schema namespace="http://www.w3.org/2002/ws/desc/wsdl/component-rpc" file="${xsd.dir}/wsdlcm-rpc.xsd" />
-				<schema namespace="http://www.w3.org/2002/ws/desc/wsdl/component-soap" file="${xsd.dir}/wsdlcm-soap.xsd" />
-				<fileset dir="results">
-					<include name="**/*.wsdlcm" />
-				</fileset>
-			</schemavalidate>
-		</target>
-
-		<target name="schemavalidate-validation-reports">
-			<schemavalidate failonerror="no">
-				<schema namespace="http://www.w3.org/2006/06/wsdl/ValidationReport" file="${xmlcatalog.dir}/wsdl/ValidationReport.xsd" />
-				<fileset dir=".">
-					<include name="*-report.xml" />
-				</fileset>
-			</schemavalidate>
-		</target>
+		<mkdir dir="results" />
+		<validatewsdl20 dir="${test-suite.dir}/documents/good" includes="**/*.wsdl" cm="yes" cmdir="results" report="documents-good-report.xml" />
+		<zip destfile="test-suite-results.zip" basedir="results" />
+	</target>
 
-	</project>
\ No newline at end of file
+	<target name="documents-bad" description="---> Validates W3C WSDL 2.0 bad document test suite and outputs report">
+		<validatewsdl20 dir="${test-suite.dir}/documents/bad" includes="**/*.wsdl" cm="no" report="documents-bad-report.xml" />
+	</target>
+
+	<target name="schemavalidate-results" description="---> Validates component model interchange format results againt schema.">
+		<schemavalidate failonerror="no">
+			<schema namespace="http://www.w3.org/XML/1998/namespace" file="${xsd.dir}/xml.xsd" />
+			<schema namespace="http://www.w3.org/2002/ws/desc/wsdl/component" file="${xsd.dir}/wsdlcm.xsd" />
+			<schema namespace="http://www.w3.org/2002/ws/desc/wsdl/component-base" file="${xsd.dir}/wsdlcm-base.xsd" />
+			<schema namespace="http://www.w3.org/2002/ws/desc/wsdl/component-extensions" file="${xsd.dir}/wsdlcm-extensions.xsd" />
+			<schema namespace="http://www.w3.org/2002/ws/desc/wsdl/component-http" file="${xsd.dir}/wsdlcm-http.xsd" />
+			<schema namespace="http://www.w3.org/2002/ws/desc/wsdl/component-rpc" file="${xsd.dir}/wsdlcm-rpc.xsd" />
+			<schema namespace="http://www.w3.org/2002/ws/desc/wsdl/component-soap" file="${xsd.dir}/wsdlcm-soap.xsd" />
+			<fileset dir="results">
+				<include name="**/*.wsdlcm" />
+			</fileset>
+		</schemavalidate>
+	</target>
+
+	<target name="schemavalidate-validation-reports">
+		<schemavalidate failonerror="no">
+			<schema namespace="http://www.w3.org/2006/06/wsdl/ValidationReport" file="${xmlcatalog.dir}/wsdl/ValidationReport.xsd" />
+			<fileset dir=".">
+				<include name="*-report.xml" />
+			</fileset>
+		</schemavalidate>
+	</target>
+
+
+	<!-- ================================= 
+          target: canonicalize-results              
+         ================================= -->
+	<target name="canonicalize-results" description="--> Canonicalizes component interchange format results">
+		<xslt style="${test-suite.dir}/results/canonicalize-wsdlcm.xslt" includes="**/*.wsdlcm" extension=".wsdlcm1" destdir="."/>
+		<xslt style="${test-suite.dir}/results/canonicalize-id-wsdlcm.xslt" includes="**/*.wsdlcm1" extension=".wsdlcm2" destdir="."/>
+	</target>
+	
+	<target name="compare">
+        <xslt style="${test-suite.dir}/results/compare-wsdlcm.xslt" in="results/Chameleon-1G/getBalance.wsdlcm2"
+            out="results/Chameleon-1G/getBalance-results.xml">
+            <param name="aspirant" expression="results/Chameleon-1G/getBalance.wsdlcm2"/>
+            <param name="archetype" expression="results-old/Chameleon-1G/getBalance.wsdlcm2"/>
+        </xslt>
+
+	</target>
+
+
+
+</project>
\ No newline at end of file

Modified: incubator/woden/branches/WODEN-40/ant-test/documents-bad-report.xml
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/ant-test/documents-bad-report.xml?rev=419889&r1=419888&r2=419889&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/ant-test/documents-bad-report.xml (original)
+++ incubator/woden/branches/WODEN-40/ant-test/documents-bad-report.xml Fri Jul  7 06:39:51 2006
@@ -2,6 +2,7 @@
 <report xmlns='http://www.w3.org/2006/06/wsdl/ValidationReport'>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Chameleon-1B/getBalance.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -13,6 +14,7 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Chameleon-2B/getBalance.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -40,6 +42,7 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Import-1B/XSDImport.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -67,6 +70,7 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Import-2B/XSDImportInWSDL.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -94,6 +98,7 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Import-3B/XSDImport2.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -113,20 +118,23 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Import-3B/XSDImportValid.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Include-1B/Echo.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Include-1B/EchoImpl.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Interface-1B/Interface.wsdl</uri>
-    <error>
-      <errorLocator>
-        <lineNumber>0</lineNumber>
-        <columnNumber>0</columnNumber>
-      </errorLocator>
-      <key>Interface-0031</key>
-      <message>The styleDefault attribute contains the IRI &apos;wsdl/style/uri&apos;, which is not absolute. All IRIs specified for styleDefault must be absolute.</message>
-    </error>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Interface-2B/Interface.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -138,6 +146,7 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Interface-3B/Interface.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -156,7 +165,60 @@
     </error>
   </wsdl>
   <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-10B/rpcstyleinout.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-11B/rpcstyleinout.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-12B/rpcstyleinout.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-13B/rpcstyleinout.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-1B/rpcstyleinonly.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-2B/rpcstyleinonly.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-3B/rpcstyleinonly.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-4B/rpcstyleinout.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-5B/rpcstyleinout.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-6B/rpcstyleinout.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-7B/rpcstyleinout.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-8B/rpcstyleinout.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-9B/rpcstyleinout.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Service-12B/Service.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -176,6 +238,7 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Service-13B/Service.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -203,6 +266,7 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Service-14B/Service.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -222,6 +286,7 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Service-15B/Service.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -241,6 +306,7 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Service-1B/Service.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -268,6 +334,7 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Service-2B/Service.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -287,6 +354,7 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/TicketAgent-1B/TicketAgent-bad.wsdl</uri>
+    <success>true</success>
     <warning>
       <errorLocator>
         <lineNumber>0</lineNumber>

Modified: incubator/woden/branches/WODEN-40/ant-test/documents-good-report.xml
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/ant-test/documents-good-report.xml?rev=419889&r1=419888&r2=419889&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/ant-test/documents-good-report.xml (original)
+++ incubator/woden/branches/WODEN-40/ant-test/documents-good-report.xml Fri Jul  7 06:39:51 2006
@@ -2,86 +2,147 @@
 <report xmlns='http://www.w3.org/2006/06/wsdl/ValidationReport'>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Chameleon-1G/getBalance.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Chameleon-2G/getBalance.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Chameleon-3G/getBalance.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Chameleon-4G/getBalance.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Compound1-1G/compound1.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/CreditCardFaults-1G/credit-card-faults.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/CreditCardFaults-1G/use-credit-card-faults.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Echo-1G/echo.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/EchoComplexDocLit-1G/Axis2SampleDocLit.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Feature-1G/bank.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/GreatH-1G/primer-hotelReservationService.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/GreatH-2G/primer-hotelReservationService.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/GreatH-3G/primer-hotelReservationService.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/HTTPBinding-1G/Echo.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/HTTPBinding-2G/Echo.wsdl</uri>
+    <success>false</success>
     <error>
       <errorLocator>
         <lineNumber>0</lineNumber>
         <columnNumber>0</columnNumber>
       </errorLocator>
       <key>Endpoint-0066</key>
-      <message>The binding &apos;org.apache.woden.internal.wsdl20.BindingImpl@7e8a7ed1&apos; specified for this endpoint specifies the interface &apos;org.apache.woden.internal.wsdl20.InterfaceImpl@7e09fed1&apos; and not the interface &apos;org.apache.woden.internal.wsdl20.InterfaceImpl@67a9fed1&apos; specified by the service. The binding specified for this endpoint must either not specify an interface or specify the same interface as the service.</message>
+      <message>The binding &apos;org.apache.woden.internal.wsdl20.BindingImpl@1db26e24&apos; specified for this endpoint specifies the interface &apos;org.apache.woden.internal.wsdl20.InterfaceImpl@1c706e24&apos; and not the interface &apos;org.apache.woden.internal.wsdl20.InterfaceImpl@779ae24&apos; specified by the service. The binding specified for this endpoint must either not specify an interface or specify the same interface as the service.</message>
     </error>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Import-1G/XSDImport.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Import-2G/XSDImport.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Import-2G/XSDImport2.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/ImportedWSDL-1G/retrieveDetails.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/ImportedWSDL-1G/updateDetails.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/InOnlyMEP-1G/Oneway.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Include-1G/Echo.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Include-1G/EchoImpl.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-1G/Interface.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-2G/Interface.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-3G/Interface.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-4G/Interface.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-5G/Interface.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-6G/Interface.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-7G/Interface.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/MultipleInlineSchemas-1G/retrieveItems.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/RPC-1G/rpcstyleinout.wsdl</uri>
+    <success>true</success>
+  </wsdl>
+  <wsdl>
+    <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/RPC-2G/rpcstyleinonly.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/SchemaId-1G/schemaIds.wsdl</uri>
+    <success>true</success>
     <warning>
       <errorLocator>
         <lineNumber>0</lineNumber>
@@ -96,44 +157,58 @@
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/SchemaLocationFragment-1G/Items.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Service-1G/Service.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Service-2G/Service.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Service-3G/Service.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/ServiceReference-1G/reservationDetails.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/ServiceReference-1G/reservationList.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/SparqlQuery-1G/sparql-protocol-query.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/TicketAgent-1G/TicketAgent.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/WeathSvc-1G/WeathSvc.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/XsImport-1G/reservation.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/XsImport-2G/reservationDetails.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/XsImport-2G/reservationItems.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/XsImport-3G/reservationDetails.wsdl</uri>
+    <success>true</success>
   </wsdl>
   <wsdl>
     <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/XsImport-3G/reservationItems.wsdl</uri>
+    <success>true</success>
   </wsdl>
 </report>

Modified: incubator/woden/branches/WODEN-40/ant-test/test-suite-results.zip
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/ant-test/test-suite-results.zip?rev=419889&r1=419888&r2=419889&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/woden/branches/WODEN-40/src/org/apache/woden/ErrorLocator.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/ErrorLocator.java?rev=419889&r1=419888&r2=419889&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/src/org/apache/woden/ErrorLocator.java (original)
+++ incubator/woden/branches/WODEN-40/src/org/apache/woden/ErrorLocator.java Fri Jul  7 06:39:51 2006
@@ -17,13 +17,14 @@
 
 /**
  * Represents the location of parsing error within a XML document.
- * Based on org.xml.sax.Locator. 
+ * Based on org.xml.sax.Locator.
+ * 
+ * TODO decide if URI info of the document is needed, 
+ * and maybe XPATH of the element or attribute in error. 
  *
  * @author kaputin
  */
 public interface ErrorLocator {
-    
-    //TODO do we need URI info or just line/col?
     
     public String getDocumentBaseURI();
     

Modified: incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/Report.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/Report.java?rev=419889&r1=419888&r2=419889&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/Report.java (original)
+++ incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/Report.java Fri Jul  7 06:39:51 2006
@@ -4,6 +4,7 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.PrintWriter;
+import java.util.Vector;
 
 import org.apache.woden.ErrorHandler;
 import org.apache.woden.ErrorInfo;
@@ -24,6 +25,8 @@
     private final String WSDL = "wsdl";
 
     private final String URI = "uri";
+    
+    private final String SUCCESS = "success";
 
     // ErrorHandler elements
 
@@ -56,6 +59,12 @@
     // Exception element
 
     private final String DETAIL_MESSAGE = "detailMessage";
+    
+    
+    // error handler data
+    private boolean success = true;
+    private Vector errorInfos = null;
+    private Vector severities = null;
 
     /**
      * Creates a report writer and writes the document root.
@@ -115,28 +124,53 @@
     }
 
     public void beginWsdl(String uri) {
+        
+        success = true;
+        errorInfos = new Vector();
+        severities = new Vector();
+        
         beginElement(WSDL);
 
         element(URI, uri);
     }
 
     public void endWsdl() {
+        
+        write(SUCCESS, success);
+        
+        for(int i = 0; i < errorInfos.size(); i ++) {
+            
+            ErrorInfo errorInfo = (ErrorInfo) errorInfos.elementAt(i);
+            String severity = (String) severities.elementAt(i);
+            
+            write(severity, errorInfo);
+        }
+        
         endElement();
+        
+        success = true;
+        errorInfos = null;
+        severities = null;
     }
 
     public void warning(ErrorInfo errorInfo) {
-
-        write(WARNING, errorInfo);
+        
+        errorInfos.add(errorInfo);
+        severities.add(WARNING);
     }
 
     public void error(ErrorInfo errorInfo) {
 
-        write(ERROR, errorInfo);
+        success = false;
+        errorInfos.add(errorInfo);
+        severities.add(ERROR);
     }
 
     public void fatalError(ErrorInfo errorInfo) {
 
-        write(FATAL_ERROR, errorInfo);
+        success = false;
+        errorInfos.add(errorInfo);
+        severities.add(FATAL_ERROR);
     }
 
     public void write(String tag, ErrorInfo errorInfo) {

Modified: incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/WsdlCm.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/WsdlCm.java?rev=419889&r1=419888&r2=419889&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/WsdlCm.java (original)
+++ incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/WsdlCm.java Fri Jul  7 06:39:51 2006
@@ -33,110 +33,22 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.PrintWriter;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
 
 import org.apache.woden.WSDLException;
 import org.apache.woden.WSDLFactory;
 import org.apache.woden.WSDLReader;
-import org.apache.woden.wsdl20.Binding;
-import org.apache.woden.wsdl20.BindingFault;
-import org.apache.woden.wsdl20.BindingFaultReference;
-import org.apache.woden.wsdl20.BindingMessageReference;
-import org.apache.woden.wsdl20.BindingOperation;
 import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.ElementDeclaration;
-import org.apache.woden.wsdl20.Endpoint;
-import org.apache.woden.wsdl20.Feature;
-import org.apache.woden.wsdl20.Interface;
-import org.apache.woden.wsdl20.InterfaceFault;
-import org.apache.woden.wsdl20.InterfaceFaultReference;
-import org.apache.woden.wsdl20.InterfaceMessageReference;
-import org.apache.woden.wsdl20.InterfaceOperation;
-import org.apache.woden.wsdl20.Property;
-import org.apache.woden.wsdl20.Service;
-import org.apache.woden.wsdl20.TypeDefinition;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.extensions.InterfaceOperationExtensions;
-import org.apache.woden.wsdl20.extensions.http.HTTPAuthenticationScheme;
-import org.apache.woden.wsdl20.extensions.http.HTTPBindingExtensions;
-import org.apache.woden.wsdl20.extensions.http.HTTPBindingFaultExtensions;
-import org.apache.woden.wsdl20.extensions.http.HTTPBindingMessageReferenceExtensions;
-import org.apache.woden.wsdl20.extensions.http.HTTPBindingOperationExtensions;
-import org.apache.woden.wsdl20.extensions.http.HTTPEndpointExtensions;
-import org.apache.woden.wsdl20.extensions.http.HTTPErrorStatusCode;
-import org.apache.woden.wsdl20.extensions.http.HTTPHeader;
-import org.apache.woden.wsdl20.extensions.rpc.Argument;
-import org.apache.woden.wsdl20.extensions.rpc.RPCInterfaceOperationExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultReferenceExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPFaultCode;
-import org.apache.woden.wsdl20.extensions.soap.SOAPFaultSubcodes;
-import org.apache.woden.wsdl20.extensions.soap.SOAPHeaderBlock;
-import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
 import org.apache.woden.wsdl20.xml.DescriptionElement;
 
 /**
- * <code>WsdlCm</code> writes the component model in the W3C interchange format.
+ * The <code>WsdlCm</code> class writes the component model in the W3C interchange format.
  * 
  * @author Arthur Ryman (ryman@ca.ibm.com, arthur-ryman@gmail.com)
  *
  */
 public class WsdlCm extends XMLWriter {
 
-    /** WSDL CM namespaces */
-    private static String WSDLCM_NS = "http://www.w3.org/2002/ws/desc/wsdl/component";
-
-    private static String WSDLCMBASE_PREFIX = "cmbase";
-
-    private static String WSDLCMBASE_NS = "http://www.w3.org/2002/ws/desc/wsdl/component-base";
-
-    private static String WSDLCMEXTENSIONS_PREFIX = "cmextensions";
-
-    private static String WSDLCMEXTENSIONS_NS = "http://www.w3.org/2002/ws/desc/wsdl/component-extensions";
-
-    private static String WSDLCMHTTP_PREFIX = "cmhttp";
-
-    private static String WSDLCMHTTP_NS = "http://www.w3.org/2002/ws/desc/wsdl/component-http";
-
-    private static String WSDLCMRPC_PREFIX = "cmrpc";
-
-    private static String WSDLCMRPC_NS = "http://www.w3.org/2002/ws/desc/wsdl/component-rpc";
-
-    private static String WSDLCMSOAP_PREFIX = "cmsoap";
-
-    private static String WSDLCMSOAP_NS = "http://www.w3.org/2002/ws/desc/wsdl/component-soap";
-
-    /** XML Schema namespace */
-    private static String XSD_NS = "http://www.w3.org/2001/XMLSchema";
-
-    /** build-in simple types */
-    private static String[] XSD_TYPES = { "string", "boolean", "decimal",
-            "float", "double", "duration", "dateTime", "time", "date",
-            "gYearMonth", "gYear", "gMonthDay", "gDay", "gMonth", "hexBinary",
-            "base64Binary", "anyURI", "QName", "NOTATION", "normalizedString",
-            "token", "language", "NMTOKEN", "NMTOKENS", "Name", "NCName", "ID",
-            "IDREF", "IDREFS", "ENTITY", "ENTITIES", "integer",
-            "nonPositiveInteger", "negativeInteger", "long", "int", "short",
-            "byte", "nonNegativeInteger", "unsignedLong", "unsignedInt",
-            "unsignedShort", "unsignedByte", "positiveInteger" };
-
-    {
-        Arrays.sort(XSD_TYPES);
-    }
-
-    private static String PARENT = WSDLCMBASE_PREFIX + ":parent";
-
-    private static String FEATURES = WSDLCMBASE_PREFIX + ":features";
-
-    private static String PROPERTIES = WSDLCMBASE_PREFIX + ":properties";
+    private CmWriter cm;
 
     /**
      * Constructs a component model writer.
@@ -145,11 +57,31 @@
      */
     public WsdlCm(PrintWriter out) {
         super(out);
+
+        // create the writes for each namespace
+        new CmBaseWriter(this);
+        new CmExtensionsWriter(this);
+        new CmRpcWriter(this);
+        new CmHttpWriter(this);
+        new CmSoapWriter(this);
+        cm = new CmWriter(this);
+    }
+
+    /**
+     * Writes the Description component in the component model interchange format.
+     * 
+     * @param descComp the Description component
+     */
+    public void write(Description descComp) {
+
+        cm.write(descComp);
     }
 
     /**
      * Tests the component model interchange format writer.
      * 
+     * TODO Move this method into a tests package.
+     * 
      * @param args the command line arguments
      */
     public static void main(String[] args) {
@@ -164,17 +96,17 @@
         if (args.length > 0) {
             wsdlLoc = args[0];
         }
-        
+
         if (args.length > 1) {
             wsdlCmLoc = args[1];
         }
-        
+
         if (args.length > 2) {
             reportLoc = args[2];
         }
 
         System.out.println("Starting: " + wsdlLoc);
-        
+
         Report reportWriter = Report.openReport(new File(reportLoc));
         reportWriter.beginWsdl(wsdlLoc);
 
@@ -208,1189 +140,9 @@
 
             e.printStackTrace();
         }
-        
+
         reportWriter.closeReport();
 
         System.out.println("Finished.");
-
-    }
-
-    /**
-     * Writes the component model.
-     * 
-     * @param component the root Description component
-     */
-    public void write(Description component) {
-
-        xmlDeclaration("UTF-8");
-
-        String attributes = "xmlns='" + WSDLCM_NS + "'\n";
-        attributes += " xmlns:" + WSDLCMEXTENSIONS_PREFIX + "='"
-                + WSDLCMEXTENSIONS_NS + "'\n";
-        attributes += " xmlns:" + WSDLCMBASE_PREFIX + "='" + WSDLCMBASE_NS
-                + "'\n";
-        attributes += " xmlns:" + WSDLCMHTTP_PREFIX + "='" + WSDLCMHTTP_NS
-                + "'\n";
-        attributes += " xmlns:" + WSDLCMRPC_PREFIX + "='" + WSDLCMRPC_NS
-                + "'\n";
-        attributes += " xmlns:" + WSDLCMSOAP_PREFIX + "='" + WSDLCMSOAP_NS
-                + "'\n";
-        attributes += idAttribute(component);
-        beginElement("descriptionComponent", attributes);
-
-        URI[] extensions = { ComponentExtensions.URI_NS_EXTENSIONS,
-                ComponentExtensions.URI_NS_HTTP,
-                ComponentExtensions.URI_NS_RPC, ComponentExtensions.URI_NS_SOAP };
-
-        writeUris("extensions", extensions);
-        write("interfaces", component.getInterfaces());
-        write("bindings", component.getBindings());
-        write("services", component.getServices());
-        write("elementDeclarations", component.getElementDeclarations());
-        write("typeDefinitions", component.getTypeDefinitions());
-
-        endElement();
-    }
-
-    private void writeRefs(String tag, Interface[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                QName x1 = ((Interface) o1).getName();
-                QName x2 = ((Interface) o2).getName();
-                return compareQName(x1, x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++) {
-            writeRef("interface", components[i]);
-        }
-
-        endElement();
-
-    }
-
-    private void write(String tag, Interface[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                QName x1 = ((Interface) o1).getName();
-                QName x2 = ((Interface) o2).getName();
-                return compareQName(x1, x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("interfaceComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, Interface component) {
-
-        beginElement(tag, idAttribute(component));
-
-        write("name", component.getName());
-        writeRefs("extendedInterfaces", component.getExtendedInterfaces());
-        write("interfaceFaults", component.getInterfaceFaults());
-        write("interfaceOperations", component.getInterfaceOperations());
-        write(FEATURES, component.getFeatures());
-        write(PROPERTIES, component.getProperties());
-
-        endElement();
-    }
-
-    private void write(String tag, InterfaceFault[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                QName x1 = ((InterfaceFault) o1).getName();
-                QName x2 = ((InterfaceFault) o2).getName();
-                return compareQName(x1, x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("interfaceFaultComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, InterfaceFault component) {
-
-        beginElement("interfaceFaultComponent", idAttribute(component));
-
-        write("name", component.getName());
-        writeOptionalRef("elementDeclaration", component
-                .getElementDeclaration());
-        write(FEATURES, component.getFeatures());
-        write(PROPERTIES, component.getProperties());
-        writeRef(PARENT, component.getParent());
-
-        endElement();
-    }
-
-    private void write(String tag, InterfaceOperation[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                QName x1 = ((InterfaceOperation) o1).getName();
-                QName x2 = ((InterfaceOperation) o2).getName();
-                return compareQName(x1, x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("interfaceOperationComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, InterfaceOperation component) {
-
-        beginElement("interfaceOperationComponent", idAttribute(component));
-
-        write("name", component.getName());
-        write("messageExchangePattern", component.getMessageExchangePattern());
-        write("interfaceMessageReferences", component
-                .getInterfaceMessageReferences());
-        write("interfaceFaultReferences", component
-                .getInterfaceFaultReferences());
-        writeUris("style", component.getStyle());
-        write(FEATURES, component.getFeatures());
-        write(PROPERTIES, component.getProperties());
-        writeRef(PARENT, component.getParent());
-
-        InterfaceOperationExtensions extensions = (InterfaceOperationExtensions) component
-                .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_EXTENSIONS);
-        if (extensions != null) {
-            
-            beginElement(WSDLCMEXTENSIONS_PREFIX
-                    + ":wsdlInterfaceOperationExtension");
-            
-            write(WSDLCMEXTENSIONS_PREFIX + ":safety", extensions.isSafety());
-            
-            endElement();
-        }
-
-        RPCInterfaceOperationExtensions rpcExtensions = (RPCInterfaceOperationExtensions) component
-                .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_RPC);
-        if (rpcExtensions != null) {
-            
-            beginElement(WSDLCMRPC_PREFIX + ":rpcInterfaceOperationExtension");
-            
-            write(WSDLCMRPC_PREFIX + ":rpcSignature", rpcExtensions
-                    .getRPCSignature());
-            
-            endElement();
-        }
-
-        endElement();
-    }
-
-    private void write(String tag, Argument[] rpcSignature) {
-
-        beginElement(tag);
-        for (int i = 0; i < rpcSignature.length; i++) {
-
-            write(WSDLCMRPC_PREFIX + ":argument", rpcSignature[i]);
-        }
-        endElement();
-    }
-
-    private void write(String tag, Argument argument) {
-
-        beginElement(tag);
-
-        write(WSDLCMRPC_PREFIX + ":name", argument.getName());
-        write(WSDLCMRPC_PREFIX + ":direction", argument.getDirection()
-                .toString());
-
-        endElement();
-    }
-
-    private void write(String tag, InterfaceMessageReference[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                String x1 = ((InterfaceMessageReference) o1).getMessageLabel()
-                        .toString();
-                String x2 = ((InterfaceMessageReference) o2).getMessageLabel()
-                        .toString();
-                return x1.compareTo(x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("interfaceMessageReferenceComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, InterfaceMessageReference component) {
-
-        beginElement(tag, idAttribute(component));
-
-        write("messageLabel", component.getMessageLabel().toString());
-        write("direction", component.getDirection().toString());
-        write("messageContentModel", component.getMessageContentModel());
-        writeOptionalRef("elementDeclaration", component
-                .getElementDeclaration());
-        write(FEATURES, component.getFeatures());
-        write(PROPERTIES, component.getProperties());
-        writeRef(PARENT, component.getParent());
-
-        endElement();
-    }
-
-    private void write(String tag, InterfaceFaultReference[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-
-                InterfaceFaultReference i1 = (InterfaceFaultReference) o1;
-                InterfaceFaultReference i2 = (InterfaceFaultReference) o2;
-
-                InterfaceFault if1 = i1.getInterfaceFault();
-                InterfaceFault if2 = i2.getInterfaceFault();
-
-                if (if1 == if2)
-                    return 0;
-                if (if1 == null)
-                    return -1;
-                if (if2 == null)
-                    return 1;
-
-                QName q1 = if1.getName();
-                QName q2 = if2.getName();
-
-                int result = compareQName(q1, q2);
-                if (result != 0)
-                    return result;
-
-                String x1 = i1.getMessageLabel().toString();
-                String x2 = i2.getMessageLabel().toString();
-                return x1.compareTo(x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("interfaceFaultReferenceComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, InterfaceFaultReference component) {
-
-        beginElement(tag, idAttribute(component));
-
-        writeRef("interfaceFault", component.getInterfaceFault());
-        write("messageLabel", component.getMessageLabel().toString());
-        write("direction", component.getDirection().toString());
-        write(FEATURES, component.getFeatures());
-        write(PROPERTIES, component.getProperties());
-        writeRef(PARENT, component.getParent());
-
-        endElement();
-    }
-
-    private void write(String tag, Binding[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                QName x1 = ((Binding) o1).getName();
-                QName x2 = ((Binding) o2).getName();
-                return compareQName(x1, x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("bindingComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, Binding component) {
-
-        beginElement(tag, idAttribute(component));
-
-        write("name", component.getName());
-        writeOptionalRef("interface", component.getInterface());
-        write("type", component.getType());
-        write("bindingFaults", component.getBindingFaults());
-        write("bindingOperations", component.getBindingOperations());
-        write(FEATURES, component.getFeatures());
-        write(PROPERTIES, component.getProperties());
-
-        HTTPBindingExtensions http = (HTTPBindingExtensions) component
-                .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
-        if (http != null) {
-            
-            beginElement(WSDLCMHTTP_PREFIX + ":httpBindingExtension");
-
-            write(WSDLCMHTTP_PREFIX + ":httpCookies", http.isHttpCookies());
-            write(WSDLCMHTTP_PREFIX + ":httpMethodDefault", http
-                    .getHttpMethodDefault());
-            write(WSDLCMHTTP_PREFIX + ":httpQueryParameterSeparatorDefault",
-                    http.getHttpQueryParameterSeparatorDefault());
-            write(WSDLCMHTTP_PREFIX + ":httpTransferCodingDefault", http
-                    .getHttpTransferCodingDefault());
-            
-            endElement();
-        }
-
-        SOAPBindingExtensions soap = (SOAPBindingExtensions) component
-                .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        if (soap != null) {
-
-            beginElement(WSDLCMSOAP_PREFIX + ":soapBindingExtension");
-
-            write(WSDLCMSOAP_PREFIX + ":soapMepDefault", soap
-                    .getSoapMepDefault());
-            write(WSDLCMSOAP_PREFIX + ":soapModules", soap.getSoapModules());
-            write(WSDLCMSOAP_PREFIX + ":soapUnderlyingProtocols", soap
-                    .getSoapMepDefault());
-            write(WSDLCMSOAP_PREFIX + ":soapVersion", soap.getSoapVersion());
-            
-            endElement();
-        }
-
-        endElement();
-    }
-
-    private void write(String tag, SOAPModule[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-
-                URI uri1 = ((SOAPModule) o1).getRef();
-                URI uri2 = ((SOAPModule) o2).getRef();
-
-                return uri1.compareTo(uri2);
-            }
-        });
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("SoapModuleComponent", components[i]);
-
-        endElement();
-
-    }
-
-    private void write(String tag, SOAPModule component) {
-
-        beginElement(tag, idAttribute(component));
-
-        write(WSDLCMSOAP_PREFIX + ":ref", component.getRef());
-
-        write(WSDLCMSOAP_PREFIX + ":required", component.isRequired()
-                .booleanValue());
-
-        writeRef(PARENT, component.getParent());
-
-        endElement();
-    }
-
-    private void write(String tag, BindingFault[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-
-                InterfaceFault if1 = ((BindingFault) o1).getInterfaceFault();
-                InterfaceFault if2 = ((BindingFault) o2).getInterfaceFault();
-
-                if (if1 == if2)
-                    return 0;
-                if (if1 == null)
-                    return -1;
-                if (if2 == null)
-                    return 1;
-
-                QName x1 = if1.getName();
-                QName x2 = if2.getName();
-
-                return compareQName(x1, x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("bindingFaultComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, BindingFault component) {
-
-        beginElement(tag, idAttribute(component));
-
-        writeRef("interfaceFault", component.getInterfaceFault());
-        write(FEATURES, component.getFeatures());
-        write(PROPERTIES, component.getProperties());
-        writeRef(PARENT, component.getParent());
-
-        HTTPBindingFaultExtensions http = (HTTPBindingFaultExtensions) component
-                .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
-        if (http != null) {
-            
-            beginElement(WSDLCMHTTP_PREFIX + ":httpBindingFaultExtension");
-
-            write(WSDLCMHTTP_PREFIX + ":httpErrorStatusCode", http
-                    .getHttpErrorStatusCode());
-            write(WSDLCMHTTP_PREFIX + ":httpHeaders", http.getHttpHeaders());
-            write(WSDLCMHTTP_PREFIX + ":httpTransferCoding", http
-                    .getHttpTransferCoding());
-            
-            endElement();
-        }
-
-        SOAPBindingFaultExtensions soap = (SOAPBindingFaultExtensions) component
-                .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        if (soap != null) {
-
-            beginElement(WSDLCMSOAP_PREFIX + ":soapBindingFaultExtension");
-            
-            write(WSDLCMSOAP_PREFIX + ":soapFaultCode", soap.getSoapFaultCode());
-            write(WSDLCMSOAP_PREFIX + ":soapFaultSubcodes", soap
-                    .getSoapFaultSubcodes());
-            write(WSDLCMSOAP_PREFIX + ":soapHeaders", soap.getSoapHeaders());
-            write(WSDLCMSOAP_PREFIX + ":soapModules", soap.getSoapModules());
-            
-            endElement();
-        }
-
-        endElement();
-    }
-
-    private void write(String tag, HTTPErrorStatusCode httpErrorStatusCode) {
-
-        if (httpErrorStatusCode == null)
-            return;
-
-        beginElement(tag);
-
-        if (httpErrorStatusCode.isCodeUsed()) {
-
-            write(WSDLCMHTTP_PREFIX + ":code", httpErrorStatusCode.toString());
-        }
-        
-        endElement();
-    }
-
-    private void write(String tag, HTTPHeader[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-
-                String n1 = ((HTTPHeader) o1).getName();
-                String n2 = ((HTTPHeader) o2).getName();
-
-                return n1.compareTo(n2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write(WSDLCMHTTP_PREFIX + ":HttpHeaderComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, HTTPHeader component) {
-
-        beginElement(tag, idAttribute(component));
-
-        write(WSDLCMHTTP_PREFIX + ":name", component.getName());
-
-        writeRef(WSDLCMHTTP_PREFIX + ":typeDefinition", component
-                .getTypeDefinition());
-
-        write(WSDLCMHTTP_PREFIX + ":required", component.isRequired());
-
-        writeRef(PARENT, component.getParent());
-
-        endElement();
-    }
-
-    private void write(String tag, SOAPFaultSubcodes soapFaultSubcodes) {
-
-        beginElement(tag);
-        if (soapFaultSubcodes.isQNames()) {
-            beginElement(WSDLCMSOAP_PREFIX + ":subcodes");
-            QName[] codes = soapFaultSubcodes.getQNames();
-            for (int i = 0; i < codes.length; i++) {
-                write(WSDLCMSOAP_PREFIX + ":code", codes[i]);
-            }
-            endElement();
-        }
-        endElement();
-    }
-
-    private void write(String tag, SOAPFaultCode soapFaultCode) {
-
-        beginElement(tag);
-        if (soapFaultCode.isQName()) {
-            write(WSDLCMSOAP_PREFIX + ":code", soapFaultCode.getQName());
-        }
-        endElement();
-    }
-
-    private void write(String tag, SOAPHeaderBlock[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-
-                ElementDeclaration ed1 = ((SOAPHeaderBlock) o1)
-                        .getElementDeclaration();
-                ElementDeclaration ed2 = ((SOAPHeaderBlock) o2)
-                        .getElementDeclaration();
-
-                if (ed1 == ed2)
-                    return 0;
-                if (ed1 == null)
-                    return -1;
-                if (ed2 == null)
-                    return 1;
-
-                QName x1 = ed1.getName();
-                QName x2 = ed2.getName();
-
-                return compareQName(x1, x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write(WSDLCMSOAP_PREFIX + ":SoapHeaderBlockComponent",
-                    components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, SOAPHeaderBlock component) {
-
-        beginElement(tag, idAttribute(component));
-
-        writeRef(WSDLCMSOAP_PREFIX + ":elementDeclaration", component
-                .getElementDeclaration());
-
-        write(WSDLCMSOAP_PREFIX + ":mustUnderstand", component.mustUnderstand()
-                .booleanValue());
-
-        write(WSDLCMSOAP_PREFIX + ":required", component.isRequired()
-                .booleanValue());
-
-        writeRef(WSDLCMSOAP_PREFIX + ":parent", component.getParent());
-
-        endElement();
-
-    }
-
-    private void write(String tag, BindingOperation[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                QName x1 = ((BindingOperation) o1).getInterfaceOperation()
-                        .getName();
-                QName x2 = ((BindingOperation) o1).getInterfaceOperation()
-                        .getName();
-                return compareQName(x1, x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("bindingOperationComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, BindingOperation component) {
-
-        beginElement(tag, idAttribute(component));
-
-        writeRef("interfaceOperation", component.getInterfaceOperation());
-        write("bindingFaultReferences", component.getBindingFaultReferences());
-        write("bindingMessageReferences", component
-                .getBindingMessageReferences());
-        write(FEATURES, component.getFeatures());
-        write(PROPERTIES, component.getProperties());
-        writeRef(PARENT, component.getParent());
-
-        HTTPBindingOperationExtensions http = (HTTPBindingOperationExtensions) component
-                .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
-        if (http != null) {
-            
-            beginElement(WSDLCMHTTP_PREFIX + ":httpBindingOperationExtension");
-
-            write(WSDLCMHTTP_PREFIX + ":httpFaultSerialization", http
-                    .getHttpFaultSerialization());
-            write(WSDLCMHTTP_PREFIX + ":httpInputSerialization", http
-                    .getHttpInputSerialization());
-            write(WSDLCMHTTP_PREFIX + ":httpLocation", http.getHttpLocation());
-            write(WSDLCMHTTP_PREFIX + ":httpLocationIgnoreUncited", http
-                    .isHttpLocationIgnoreUncited());
-            write(WSDLCMHTTP_PREFIX + ":httpMethod", http.getHttpMethod());
-            write(WSDLCMHTTP_PREFIX + ":httpOutputSerialization", http
-                    .getHttpOutputSerialization());
-            write(WSDLCMHTTP_PREFIX + ":httpQueryParameterSeparator", http
-                    .getHttpQueryParameterSeparator());
-            write(WSDLCMHTTP_PREFIX + ":httpTransferCodingDefault", http
-                    .getHttpTransferCodingDefault());
-            
-            endElement();
-        }
-
-        SOAPBindingOperationExtensions soap = (SOAPBindingOperationExtensions) component
-                .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        if (soap != null) {
-            
-            beginElement(WSDLCMSOAP_PREFIX + ":soapBindingOperationExtension");
-
-            write(WSDLCMSOAP_PREFIX + ":soapAction", soap.getSoapAction());
-            write(WSDLCMSOAP_PREFIX + ":soapMep", soap.getSoapMep());
-            write(WSDLCMSOAP_PREFIX + ":soapModules", soap.getSoapModules());
-            
-            endElement();
-        }
-
-        endElement();
-    }
-
-    private void write(String tag, BindingMessageReference[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-
-                InterfaceMessageReference i1 = ((BindingMessageReference) o1)
-                        .getInterfaceMessageReference();
-                InterfaceMessageReference i2 = ((BindingMessageReference) o2)
-                        .getInterfaceMessageReference();
-
-                String x1 = i1.getMessageLabel().toString();
-                String x2 = i2.getMessageLabel().toString();
-                return x1.compareTo(x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("bindingMessageReferenceComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, BindingMessageReference component) {
-
-        beginElement(tag, idAttribute(component));
-
-        writeRef("interfaceMessageReference", component
-                .getInterfaceMessageReference());
-        write(FEATURES, component.getFeatures());
-        write(PROPERTIES, component.getProperties());
-        writeRef(PARENT, component.getParent());
-
-        HTTPBindingMessageReferenceExtensions http = (HTTPBindingMessageReferenceExtensions) component
-                .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
-        if (http != null) {
-            
-            beginElement(WSDLCMHTTP_PREFIX + ":httpBindingMessageReferenceExtension");
-
-            write(WSDLCMHTTP_PREFIX + ":httpHeaders", http.getHttpHeaders());
-            write(WSDLCMHTTP_PREFIX + ":httpTransferCoding", http
-                    .getHttpTransferCoding());
-            
-            endElement();
-        }
-
-        SOAPBindingMessageReferenceExtensions soap = (SOAPBindingMessageReferenceExtensions) component
-                .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        if (soap != null) {
-            
-            beginElement(WSDLCMSOAP_PREFIX + ":soapBindingMessageReferenceExtension");
-
-            write(WSDLCMSOAP_PREFIX + ":soapHeaders", soap.getSoapHeaders());
-            write(WSDLCMSOAP_PREFIX + ":soapModules", soap.getSoapModules());
-            
-            endElement();
-        }
-
-        endElement();
-    }
-
-    private void write(String tag, BindingFaultReference[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-
-                InterfaceFaultReference i1 = ((BindingFaultReference) o1)
-                        .getInterfaceFaultReference();
-                InterfaceFaultReference i2 = ((BindingFaultReference) o2)
-                        .getInterfaceFaultReference();
-
-                QName q1 = i1.getInterfaceFault().getName();
-                QName q2 = i2.getInterfaceFault().getName();
-
-                int result = compareQName(q1, q2);
-                if (result != 0)
-                    return result;
-
-                String x1 = i1.getMessageLabel().toString();
-                String x2 = i2.getMessageLabel().toString();
-                return x1.compareTo(x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("bindingFaultReferenceComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, BindingFaultReference component) {
-
-        beginElement(tag, idAttribute(component));
-
-        writeRef("interfaceFaultReference", component
-                .getInterfaceFaultReference());
-        write(FEATURES, component.getFeatures());
-        write(PROPERTIES, component.getProperties());
-        writeRef(PARENT, component.getParent());
-
-        SOAPBindingFaultReferenceExtensions soap = (SOAPBindingFaultReferenceExtensions) component
-                .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        if (soap != null) {
-            
-            beginElement(WSDLCMSOAP_PREFIX + ":soapBindingFaultReferenceExtension");
-
-            write(WSDLCMSOAP_PREFIX + ":soapModules", soap.getSoapModules());
-            
-            endElement();
-        }
-
-        endElement();
-    }
-
-    private void write(String tag, Service[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                QName x1 = ((Service) o1).getName();
-                QName x2 = ((Service) o2).getName();
-                return compareQName(x1, x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("serviceComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, Service component) {
-
-        beginElement(tag, idAttribute(component));
-
-        write("name", component.getName());
-        writeRef("interface", component.getInterface());
-        write("endpoints", component.getEndpoints());
-        write(FEATURES, component.getFeatures());
-        write(PROPERTIES, component.getProperties());
-
-        endElement();
-    }
-
-    private void write(String tag, Endpoint[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                String x1 = ((Endpoint) o1).getName().toString();
-                String x2 = ((Endpoint) o2).getName().toString();
-                return x1.compareTo(x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++) {
-            write("endpointComponent", components[i]);
-        }
-
-        endElement();
-
-    }
-
-    private void write(String tag, Endpoint component) {
-
-        beginElement(tag, idAttribute(component));
-
-        write("name", component.getName());
-        writeRef("binding", component.getBinding());
-        write("address", component.getAddress());
-        write("feaures", component.getFeatures());
-        write(PROPERTIES, component.getProperties());
-        writeRef(PARENT, component.getParent());
-
-        HTTPEndpointExtensions http = (HTTPEndpointExtensions) component
-                .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
-
-        if (http != null) {
-
-            beginElement(WSDLCMHTTP_PREFIX + ":httpEndpointExtension");
-            
-            write(WSDLCMHTTP_PREFIX + ":httpAuthenticationRealm", http
-                    .getHttpAuthenticationRealm());
-            write(WSDLCMHTTP_PREFIX + ":httpAuthenticationScheme", http
-                    .getHttpAuthenicationScheme());
-            
-            endElement();
-        }
-
-        endElement();
-    }
-
-    private void write(String tag, HTTPAuthenticationScheme scheme) {
-
-        if (scheme == null)
-            return;
-
-        write(tag, scheme.toString());
-    }
-
-    private void write(String tag, ElementDeclaration[] components) {
-
-        // filter out the XSD elements until Woden fixes the bug
-        Vector filteredElements = new Vector();
-        for (int i = 0; i < components.length; i++) {
-            if (!XSD_NS.equals(components[i].getName().getNamespaceURI()))
-                filteredElements.addElement(components[i]);
-        }
-        components = new ElementDeclaration[filteredElements.size()];
-        filteredElements.copyInto(components);
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                QName x1 = ((ElementDeclaration) o1).getName();
-                QName x2 = ((ElementDeclaration) o2).getName();
-                return compareQName(x1, x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("elementDeclarationComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, ElementDeclaration component) {
-
-        beginElement(tag, idAttribute(component));
-
-        write("name", component.getName());
-        write("system", component.getSystem());
-
-        endElement();
-    }
-
-    private void write(String tag, TypeDefinition[] components) {
-
-        // filter out the XSD non-built-in types until Woden fixes the bug
-        Vector filteredTypes = new Vector();
-        for (int i = 0; i < components.length; i++) {
-            if (!XSD_NS.equals(components[i].getName().getNamespaceURI())) {
-                filteredTypes.addElement(components[i]);
-            } else {
-                if (Arrays.binarySearch(XSD_TYPES, components[i].getName()
-                        .getLocalPart()) >= 0)
-                    filteredTypes.addElement(components[i]);
-            }
-        }
-        components = new TypeDefinition[filteredTypes.size()];
-        filteredTypes.copyInto(components);
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                QName x1 = ((TypeDefinition) o1).getName();
-                QName x2 = ((TypeDefinition) o2).getName();
-                return compareQName(x1, x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++)
-            write("typeDefinitionComponent", components[i]);
-
-        endElement();
-    }
-
-    private void write(String tag, TypeDefinition component) {
-
-        beginElement(tag, idAttribute(component));
-
-        write("name", component.getName());
-        write("system", component.getSystem());
-
-        endElement();
-    }
-
-    private void write(String tag, Feature[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                URI x1 = ((Feature) o1).getRef();
-                URI x2 = ((Feature) o2).getRef();
-                return x1.compareTo(x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++) {
-            write("featureComponent", components[i]);
-        }
-        endElement();
-    }
-
-    private void write(String tag, Feature component) {
-
-        beginElement(tag, idAttribute(component));
-
-        write("ref", component.getRef());
-        write("required", component.isRequired());
-        writeRef(PARENT, component.getParent());
-
-        endElement();
-    }
-
-    private void write(String tag, Property[] components) {
-
-        if (components.length == 0)
-            return;
-
-        Arrays.sort(components, new Comparator() {
-
-            public int compare(Object o1, Object o2) {
-                URI x1 = ((Property) o1).getRef();
-                URI x2 = ((Property) o2).getRef();
-                return x1.compareTo(x2);
-            }
-        });
-
-        beginElement(tag);
-
-        for (int i = 0; i < components.length; i++) {
-            write("propertyComponent", components[i]);
-        }
-
-        endElement();
-    }
-
-    private void write(String tag, Property component) {
-
-        beginElement(tag, idAttribute(component));
-
-        write("ref", component.getRef());
-        writeOptionalRef("valueConstraint", component.getValueConstraint());
-        writeAny("value", component.getValue());
-        writeRef(PARENT, component.getParent());
-
-        endElement();
-    }
-
-    private void write(String tag, QName qname) {
-
-        if (qname == null)
-            return;
-
-        beginElement(tag);
-
-        element(WSDLCMBASE_PREFIX + ":namespaceName", qname.getNamespaceURI());
-        element(WSDLCMBASE_PREFIX + ":localName", qname.getLocalPart());
-
-        endElement();
-    }
-
-    private void write(String tag, URI uri) {
-
-        if (uri == null)
-            return;
-
-        element(tag, uri.toString());
-    }
-
-    private void writeAny(String tag, Object o) {
-
-        if (o == null)
-            return;
-
-        // TODO: write element content correctly
-        element(tag, o.toString());
-    }
-
-    private void writeOptionalRef(String tag, Object o) {
-
-        if (o == null)
-            return;
-
-        writeRef(tag, o);
-    }
-
-    private void writeRef(String tag, Object o) {
-
-        emptyElement(tag, refAttribute(o));
-    }
-
-    private void writeUris(String tag, URI[] uris) {
-
-        if (uris.length == 0)
-            return;
-
-        Arrays.sort(uris);
-
-        beginElement(tag);
-
-        for (int i = 0; i < uris.length; i++)
-            write(WSDLCMBASE_PREFIX + ":uri", uris[i]);
-
-        endElement();
-    }
-
-    private static String id(Object o) {
-
-        if (o == null) {
-            return "id-null";
-        }
-
-        return "id-" + o.hashCode();
-    }
-
-    private static String idAttribute(Object o) {
-
-        return "xml:id='" + id(o) + "'";
-    }
-
-    private static String refAttribute(Object o) {
-
-        return "ref='" + id(o) + "'";
-    }
-
-    private static int compareQName(QName q1, QName q2) {
-
-        if (q1.equals(q2))
-            return 0;
-
-        String n1 = q1.getNamespaceURI();
-        String n2 = q2.getNamespaceURI();
-        if (n1.equals(n2)) {
-            String l1 = q1.getLocalPart();
-            String l2 = q2.getLocalPart();
-
-            return l1.compareTo(l2);
-        } else {
-            return n1.compareTo(n2);
-        }
     }
 }

Modified: incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/XMLWriter.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/XMLWriter.java?rev=419889&r1=419888&r2=419889&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/XMLWriter.java (original)
+++ incubator/woden/branches/WODEN-40/src/org/apache/woden/ant/XMLWriter.java Fri Jul  7 06:39:51 2006
@@ -1,6 +1,7 @@
 package org.apache.woden.ant;
 
 import java.io.PrintWriter;
+import java.util.HashMap;
 import java.util.Stack;
 
 import org.apache.woden.types.NCName;
@@ -12,6 +13,8 @@
  *
  */
 public class XMLWriter {
+    
+    private HashMap registry = new HashMap();
 
     private PrintWriter out;
 
@@ -263,5 +266,26 @@
         }
 
         return y.toString();
+    }
+    
+    /**
+     * Registers a namespace writer for this XML writer.
+     * 
+     * @param writer the namespace writer
+     */
+    public void register(NamespaceWriter writer) {
+        
+        registry.put(writer.getNamespace(), writer);
+    }
+    
+    /**
+     * Looks up a namespace writer for this XML writer.
+     * 
+     * @param namespace the namespace to look up
+     * @return the namespace writer
+     */
+    public NamespaceWriter lookup(String namespace) {
+        
+        return (NamespaceWriter) registry.get(namespace);
     }
 }

Modified: incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/ErrorLocatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/ErrorLocatorImpl.java?rev=419889&r1=419888&r2=419889&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/ErrorLocatorImpl.java (original)
+++ incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/ErrorLocatorImpl.java Fri Jul  7 06:39:51 2006
@@ -59,20 +59,11 @@
     }
 
     /**
-     * Set the column number of this locator.
-     * 
-     * @param col The column number to set.
-     */
-    public void setColumnNumber(int col) {
-        fColumnNumber = col;
-    }
-    
-    /**
      * Set the base URI of this locator.
      * 
      * @param uri The URI of the base location to set.
      */
-    public void getDocumentBaseURI(String uri) {
+    public void setDocumentBaseURI(String uri) {
         // TODO required?
     }
 
@@ -81,7 +72,7 @@
      * 
      * @param uri The URI of the location to set.
      */
-    public void getLocationURI(String uri) {
+    public void setLocationURI(String uri) {
         // TODO required?
     }
 
@@ -94,4 +85,13 @@
         fLineNumber = line;
     }
 
+    /**
+     * Set the column number of this locator.
+     * 
+     * @param col The column number to set.
+     */
+    public void setColumnNumber(int col) {
+        fColumnNumber = col;
+    }
+    
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org