[Bedework-commit] bwxml r29 - in trunk: . calws-soap exchangews exsynchws

[svnadmin at bedework.org]

Author: douglm
Date: 2011-03-26 01:13:41 -0400 (Sat, 26 Mar 2011)
New Revision: 29

Modified:
   trunk/build.xml
   trunk/calws-soap/wssvc.wsdl
   trunk/exchangews/Services.wsdl
   trunk/exsynchws/wssvc.wsdl
Log:
Fix config,bwxml and filters so that service locations are correctly embedded in wsdl

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2011-03-25 21:03:38 UTC (rev 28)
+++ trunk/build.xml	2011-03-26 05:13:41 UTC (rev 29)
@@ -94,9 +94,6 @@
     <property name="exsynch.wsdllocation"
               value="${bedework-options.org.bedework.app.Exsynch.remoteWSDLURI}" />
     
-    <property name="wsdl.deploy.dir"
-              location="${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/wsdls" />
-    
     <!-- Filesets used for dependencies -->
     <fileset id="org.bedework.schemas.files"
              dir="${org.bedework.schemas.base}" />
@@ -167,31 +164,46 @@
 
   <target name="deploy" depends="deploy-init,build"
                description="Deploy generated files">
-    <!-- Exchange wsdl -->
-    <echo message="Copy the wsdl to ${exchange.wsdllocation}"/>
-    <echo message="deploy to ${wsdl.deploy.dir}"/>
-    <echo message="appserver deploy dir ${org.bedework.server.resource.root.dir}"/>
-    <debugMsg message="Copy the wsdl to ${exchange.wsdllocation}"/>
+    
+    <if>
+      <isset property="bedework-options.org.bedework.app.Pubcaldav.exsynchWsURI" />
+      <then>
+        <!-- Exchange wsdl -->
+        <debugMsg message="Copy the wsdl to ${org.bedework.exchange.wsdl.deploy.dir}"/>
+    
+        <copy todir="${org.bedework.exchange.wsdl.deploy.dir}" overwrite="yes">
+          <fileset dir="${org.bedework.exchangews.base}"
+                   includes="*.xsd,*.wsdl" />
+          <filterset>
+            <filter token="SERVICE-URL" 
+                     value="${org.bedework.exchange.ws.url}"/>
+          </filterset>
+        </copy>
 
-    <copy todir="${wsdl.deploy.dir}/exchange" overwrite="yes">
-      <fileset dir="${org.bedework.exchangews.base}"
-               includes="*.xsd,*.wsdl" />
-    </copy>
+        <!-- Exchange synch wsdl -->
+        <debugMsg message="Copy the wsdl to ${org.bedework.exsynch.wsdl.deploy.dir}"/>
+    
+        <copy todir="${org.bedework.exsynch.wsdl.deploy.dir}" overwrite="yes">
+          <fileset dir="${org.bedework.exsynchws.base}"
+                   includes="*.xsd,*.wsdl" />
+          <filterset>
+            <filter token="SERVICE-URL"
+                    value="${org.bedework.exsynch.service}"/>
+          </filterset>
+        </copy>
+        </then>
+      </if>
 
-    <!-- Exchange synch wsdl -->
-    <debugMsg message="Copy the wsdl to ${wsdl.deploy.dir}/exsynch"/>
-
-    <copy todir="${wsdl.deploy.dir}/exsynch" overwrite="yes">
-      <fileset dir="${org.bedework.exsynchws.base}"
-               includes="*.xsd,*.wsdl" />
-    </copy>
-
     <!-- CalWs wsdl -->
-    <debugMsg message="Copy the wsdl to ${wsdl.deploy.dir}/calws-soap"/>
+    <debugMsg message="Copy the wsdl to ${org.bedework.calws.wsdl.deploy.dir}"/>
 
-    <copy todir="${wsdl.deploy.dir}/calws-soap" overwrite="yes">
+    <copy todir="${org.bedework.calws.wsdl.deploy.dir}" overwrite="yes">
       <fileset dir="${org.bedework.calws-soap.base}"
                includes="*.xsd,*.wsdl" />
+      <filterset>
+        <filter token="SERVICE-URL" 
+                value="${org.bedework.calws-soap.service}"/>
+      </filterset>
     </copy>
   </target>
 

Modified: trunk/calws-soap/wssvc.wsdl
===================================================================
--- trunk/calws-soap/wssvc.wsdl	2011-03-25 21:03:38 UTC (rev 28)
+++ trunk/calws-soap/wssvc.wsdl	2011-03-26 05:13:41 UTC (rev 29)
@@ -178,7 +178,7 @@
 
   <wsdl:service name="CalWsService">
     <wsdl:port name="CalWsPort" binding="tns:CalWsServiceBinding">
-       <soap:address location="http://localhost:8080/ucaldav/calws-soap/"></soap:address>
+       <soap:address location="@SERVICE-URL@"></soap:address>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>  
\ No newline at end of file

Modified: trunk/exchangews/Services.wsdl
===================================================================
--- trunk/exchangews/Services.wsdl	2011-03-25 21:03:38 UTC (rev 28)
+++ trunk/exchangews/Services.wsdl	2011-03-26 05:13:41 UTC (rev 29)
@@ -1511,7 +1511,7 @@
 
   <wsdl:service name="ExchangeWebService">
     <wsdl:port name="ExchangeWebPort" binding="tns:ExchangeServiceBinding">
-       <soap:address location="https://tootles-fe1.neverland.rpi.edu/EWS/Exchange.asmx"></soap:address>
+       <soap:address location="@SERVICE-URL@"></soap:address>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

Modified: trunk/exsynchws/wssvc.wsdl
===================================================================
--- trunk/exsynchws/wssvc.wsdl	2011-03-25 21:03:38 UTC (rev 28)
+++ trunk/exsynchws/wssvc.wsdl	2011-03-26 05:13:41 UTC (rev 29)
@@ -178,7 +178,7 @@
 
   <wsdl:service name="ExsynchRemoteService">
     <wsdl:port name="ExsynchRSPort" binding="tns:ExsynchRemoteServiceBinding">
-       <soap:address location="http://localhost:8080/pubcaldav/exsynchws/"></soap:address>
+       <soap:address location="@SERVICE-URL@"></soap:address>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>  
\ No newline at end of file