Changeset 3246

Show
Ignore:
Timestamp:
03/26/11 01:13:45
Author:
douglm
Message:

Fix config,bwxml and filters so that service locations are correctly embedded in wsdl

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildfilters.xml

    r3237 r3246  
    113113    <filter token="SCHEMA-DELIMITER" 
    114114            value="${propval.app.schema.delimiter}" /> 
     115 
     116    <filter token="calSoapWsURI" 
     117            value="${org.bedework.calws-soap.uri}" /> 
     118 
     119    <filter token="exsynchWsURI" 
     120            value="${org.bedework.exsynch.uri}" /> 
    115121  </filterset> 
    116122 

  • trunk/config/bwbuild/jboss-postgresql/cal.options.xml

    r3241 r3246  
    758758          <webcalServiceURI>/webcal</webcalServiceURI> 
    759759 
    760           <!-- Comment out or delete for soap web service --> 
    761           <calSoapWsURI>/calws-soap/</calSoapWsURI> 
     760          <!-- SOAP web service  
     761               This corresponds to the full uri in the properties file. 
     762               Defined as a global deployment property 
     763                
     764               NOTE: tthe value below is defined in the build properties  
     765                --> 
     766          <calSoapWsURI>@calSoapWsURI@</calSoapWsURI> 
     767           
     768          <!-- This corresponds to the deployment path in the properties file. 
     769               Defined as a global deployment property  --> 
    762770          <calSoapWsWSDLURI>http://localhost:8080/wsdls/calws-soap/wssvc.wsdl</calSoapWsWSDLURI> 
    763771        </Usercaldav> 
    …… 
    789797          <webcalServiceURI>/webcal</webcalServiceURI> 
    790798 
    791           <!-- The bedework end of the exchnage synch service. This is a web 
     799          <!-- The bedework end of the exchange synch service. This is a web 
    792800               service called by the synch engine to get information out of 
    793801               bedework and to update events and status. 
    …… 
    796804                
    797805               Coming up on a separate port might help to lock it down. 
    798                Comment out or delete for no exchange synch service --> 
    799           <exsynchWsURI>/exsynchws/</exsynchWsURI> 
     806               Comment out or delete for no exchange synch service  
     807                
     808               NOTE: tthe value below is defined in the build properties  
     809               --> 
     810          <exsynchWsURI>@exsynchWsURI@</exsynchWsURI> 
    800811        </Pubcaldav> 
    801812 
    …… 
    913924 
    914925          <!-- location of the WSDL - modified to include server element  
    915                localhost may be good enough  
     926               This corresponds to the wsdl deploy location defined in the 
     927               build properties file. 
    916928          --> 
    917929          <exchangeWSDLURI>http://localhost:8080/wsdls/exchange/Services.wsdl</exchangeWSDLURI> 
    918930 
    919           <!-- location of the WSDL for the remote web service --> 
     931          <!-- location of the WSDL for the remote web service  
     932               This corresponds to the wsdl deploy location defined in the 
     933               build properties file. 
     934          --> 
    920935          <remoteWSDLURI>http://localhost:8080/wsdls/exsynch/wssvc.wsdl</remoteWSDLURI> 
    921936 

  • trunk/config/bwbuild/jboss-postgresql/cal.properties

    r3237 r3246  
    187187org.bedework.global.copy.activemq.config=yes 
    188188 
     189# ------------------------------------------------------------------------ 
     190# Deployment locations for the wsdls and associated files. 
     191# For each related service there is a run time URL to allow client services  
     192# to access these deployed wsdls. 
     193# 
     194# In addition we define the location of the associated service which has to be 
     195# embedded in the wsdl. 
     196# ------------------------------------------------------------------------ 
     197 
     198# All wsdls are under this directory 
     199org.bedework.wsdl.deploy.dir=${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/wsdls 
     200 
     201# The exchange web service - needed for exchnage synch service 
     202org.bedework.exchange.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/exchange 
     203 
     204# Exchange synch - wsdl 
     205org.bedework.exsynch.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/exsynch 
     206# Exchange synch - service 
     207org.bedework.exsynch.uri=/exsynchws/ 
     208org.bedework.exsynch.service=http://localhost:8080/pubcaldav${org.bedework.exsynch.uri} 
     209 
     210org.bedework.calws.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/calws-soap 
     211org.bedework.calws-soap.uri=/calws-soap/ 
     212org.bedework.calws-soap.service=http://localhost:8080/ucaldav${org.bedework.calws-soap.uri} 
     213 
     214org.bedework.exchange.ws.url=https://tootles-fe1.neverland.rpi.edu/EWS/Exchange.asmx 
     215 
    189216# 
    190217# ------------------------------------------------------------------------