[jboss-svn-commits] JBossWS SVN: r623 - in branches/jbossws-1.0/src/test: ant resources/samples/wseventing/WEB-INF/wsdl

[jboss-svn-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2006-07-19 08:46:40 -0400 (Wed, 19 Jul 2006)
New Revision: 623

Modified:
   branches/jbossws-1.0/src/test/ant/build-jars.xml
   branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.wsdl
   branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.xsd
Log:
use local wsa schema

Modified: branches/jbossws-1.0/src/test/ant/build-jars.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars.xml	2006-07-19 12:46:16 UTC (rev 622)
+++ branches/jbossws-1.0/src/test/ant/build-jars.xml	2006-07-19 12:46:40 UTC (rev 623)
@@ -1027,7 +1027,9 @@
       <webinf dir="${build.test.dir}/resources/samples/wseventing/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
-        <include name="wsdl/**"/>
+        <include name="wsdl/sysmon.wsdl"/>
+        <include name="wsdl/jbwse.wsdl"/>
+        <include name="wsdl/jbwse.xsd"/>
       </webinf>
     </war>
     <jar jarfile="${build.test.dir}/libs/jbossws-samples-eventing-client.jar">

Modified: branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.wsdl	2006-07-19 12:46:16 UTC (rev 622)
+++ branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.wsdl	2006-07-19 12:46:40 UTC (rev 623)
@@ -9,9 +9,7 @@
       xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
 
    <wsdl:types>
-      <xs:schema targetNamespace='http://schemas.xmlsoap.org/ws/2004/08/eventing'>
-         <xs:include schemaLocation='jbwse.xsd'/>
-      </xs:schema>       
+      <xs:import namespace="http://schemas.xmlsoap.org/ws/2004/08/eventing" schemaLocation="http://schemas.xmlsoap.org/ws/2004/08/eventing/eventing.xsd"/>
    </wsdl:types>
 
    <wsdl:message name='SubscribeMsg'>

Modified: branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.xsd
===================================================================
--- branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.xsd	2006-07-19 12:46:16 UTC (rev 622)
+++ branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.xsd	2006-07-19 12:46:40 UTC (rev 623)
@@ -9,11 +9,9 @@
         attributeFormDefault="unqualified"
         blockDefault="#all">
 
-    <!--TODO Parser complains about this
-xs:import namespace="http://www.w3.org/XML/1998/namespace"
-    schemaLocation="http://www.w3.org/2001/xml.xsd"/-->
+    <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
 
-    <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="jbwsa.xsd"/>
+    <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd"/>
 
     <!-- Types and global elements -->
     <xs:complexType name="DeliveryType" mixed="true">