Changeset 3315

Show
Ignore:
Timestamp:
08/26/11 15:20:06
Author:
douglm
Message:

Possible to get a subscribe request out of bedework into the synch engine and see a subscription created.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildfilters.xml

    r3246 r3315  
    117117            value="${org.bedework.calws-soap.uri}" /> 
    118118 
    119     <filter token="exsynchWsURI" 
    120             value="${org.bedework.exsynch.uri}" /> 
     119    <filter token="synchWsURI" 
     120            value="${org.bedework.synch.uri}" /> 
     121 
     122    <filter token="synchService" 
     123            value="${org.bedework.synch.service}" /> 
     124 
     125    <filter token="synchServiceManager" 
     126            value="${org.bedework.synch.service.manager}" /> 
     127 
     128    <filter token="SYNCH_WSDL_DIR" 
     129            value="${org.bedework.synch.wsdl.deploy.dir}" /> 
     130 
     131    <filter token="synchWsdlURI" 
     132            value="${org.bedework.synch.wsdl.uri}" /> 
    121133  </filterset> 
    122134 

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

    r3313 r3315  
    5959          <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 
    6060        </systemRoots> 
     61         
     62        <synchWsdlUri>@synchWsdlURI@</synchWsdlUri> 
     63        <synchManagerUri>@synchServiceManager@</synchManagerUri> 
    6164 
    6265        <!-- To enable mapping of calendar addresses e.g. mailto:fred@example.org 
    …… 
    805808               Coming up on a separate port might help to lock it down. 
    806809               Comment out or delete for no synch service  
    807                 
    808                NOTE: the value below is defined in the build properties  
    809810               --> 
    810811          <synchWsURI>/synchws/</synchWsURI> 

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

    r3307 r3315  
    209209org.bedework.exchange.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/exchange 
    210210 
    211 # synch - wsdl 
     211# synch - wsdl where we deploy for the build. 
    212212org.bedework.synch.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/synch 
     213#              where runnign services download it. 
     214org.bedework.synch.wsdl.uri=http://localhost:8080/wsdls/synch/wssvc.wsdl 
     215 
    213216# synch - service 
    214 org.bedework.synch.uri=/synchws/ 
    215 org.bedework.synch.service=http://localhost:8080/pubcaldav${org.bedework.synch.uri} 
     217org.bedework.synch.service.context=/synch 
     218org.bedework.synch.service=http://localhost:8080${org.bedework.synch.service.context} 
     219# synch - service - manager - this correcsponds to the manager connector  
     220#         configured into the synch service byt its own config. 
     221org.bedework.synch.service.manager=${org.bedework.synch.service}/manager 
    216222 
    217223org.bedework.calws.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/calws-soap 
     224 
    218225org.bedework.calws-soap.uri=/calws-soap/ 
    219226org.bedework.calws-soap.service=http://localhost:8080/ucaldav${org.bedework.calws-soap.uri} 
    220227 
     228# Bedework end of the synch service - a separate context on pubcaldav 
     229org.bedework.bwsynch.wsuri=/synchws/ 
     230org.bedework.bwsynch.service=http://localhost:8080/pubcaldav${org.bedework.bwsynch.wsuri} 
     231 
     232# Wher our exchange server is located - this is probably not needed now 
    221233org.bedework.exchange.ws.url=https://tootles-fe1.neverland.rpi.edu/EWS/Exchange.asmx 
    222234 
    …… 
    504516org.bedework.app.Pubcalws.web.xml=war/WEB-INF/publicws-web.xml 
    505517org.bedework.app.Pubcalws.tomcat.context.xml=war/META-INF/publiccontext.xml 
    506 org.bedework.app.Pubcalws.war.name=Pubcalws 
    507 org.bedework.app.Pubcalws.context.root=/Pubcalws 
     518org.bedework.app.Pubcalws.war.name=pubcalws 
     519org.bedework.app.Pubcalws.context.root=/pubcalws 
    508520# Set for jboss 
    509521#org.bedework.app.Pubcalws.virtual.host= 
    …… 
    759771org.bedework.app.synchwcb.web.xml=war/WEB-INF/web.xml 
    760772org.bedework.app.synchwcb.war.name=synch 
    761 org.bedework.app.synchwcb.context.root=/synch 
     773org.bedework.app.synchwcb.context.root=${org.bedework.synch.service.context} 
    762774# Set for jboss 
    763775#org.bedework.app.usercarddav.virtual.host=events.rpi.edu 

  • trunk/config/bwbuild/jboss-postgresql/synch-config.xml

    r3313 r3315  
    9999  </bean> 
    100100   
    101   <!-- The connector "file" will load the following config -  
     101  <!-- The connector "read-only-file" will load the following config -  
    102102       the suffix "FileConfig" is appended to the connector id --> 
    103103  <bean id="read-only-fileFileConfig"