Changeset 3390

Show
Ignore:
Timestamp:
11/02/11 22:08:51
Author:
douglm
Message:

Remove last vestiges of syncml support - never fully worked.

Added a synch handler for interactions with the synch engine.

New message used to get information about the synch service into bedework so it can be used to set up the subscribe page.

Minor fix to the synch connections service.

Synch engine now deletes a subscription after one end disappears

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.8/config/bwbuild/.defaults/cal.options.xml

    r3361 r3390  
    7878          <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 
    7979        </systemRoots> 
     80         
     81        <synchWsdlUri>@synchWsdlURI@</synchWsdlUri> 
     82        <synchManagerUri>@synchServiceManager@</synchManagerUri> 
     83         
     84        <!-- This must match the connector id in the synch config.  
     85             It identifies which connection we are using for communication 
     86             with the synch engine. 
     87          --> 
     88        <synchConnectorId>localBedework</synchConnectorId> 
    8089 
    8190        <!-- To enable mapping of calendar addresses e.g. mailto:fred@example.org 

  • releases/bedework-3.8/config/bwbuild/.defaults/synch-config.xml

    r3388 r3390  
    77  <!-- ===================================================================== 
    88       Synch engine configuration 
     9        
     10       Eventually this data will migrate into a database to allow for dynamic  
     11       persistent configuration of the system. Many of these properties can be 
     12       changed via the jmx console but currently the chanegs will not survive 
     13       a restart. 
    914       ===================================================================== --> 
    1015  <bean id="synchConfig"  
    …… 
    4550              value="http://localhost:8080/tzsvr" /> 
    4651 
     52    <!-- The table of connectors we define. Each has an id, the key and a  
     53         value which is the class of the connector for that id. The ids must be 
     54         unique, but we may have more than one occurrence of connectors with the 
     55          class. 
     56           
     57          For example we could have two bedework connectors to allow synch 
     58          between the local bedework and some other remote bedework. 
     59     -->                
    4760    <property name="connectors"> 
    4861      <map> 
    …… 
    5770               value="org.bedework.synch.cnctrs.exchange.ExchangeConnector" /> 
    5871 
    59         <!-- A bedework connector -->                
    60         <entry key="bwdemo"  
     72        <!-- A local bedework connector. This handles connections to the local 
     73             bedework system. This name is configured in to bedework so that 
     74             it can locate its own connections.  
     75          -->                
     76        <entry key="localBedework"  
    6177               value="org.bedework.synch.cnctrs.bedework.BedeworkConnector" /> 
    6278 
    …… 
    92108  </bean> 
    93109   
    94   <!-- The connector "bwdemo" will load the following config -  
     110  <!-- The connector "localBedework" will load the following config -  
    95111       the suffix "BedeworkConfig" is appended to the connector id --> 
    96   <bean id="bwdemoBedeworkConfig"  
     112  <bean id="localBedeworkBedeworkConfig"  
    97113        class="org.bedework.synch.cnctrs.bedework.BedeworkConnectorConfig"> 
    98114    <property name="readOnly" value="false" /> 

  • releases/bedework-3.8/config/bwbuild/jboss-postgresql-devel/cal.options.xml

    r3361 r3390  
    8181        <synchWsdlUri>@synchWsdlURI@</synchWsdlUri> 
    8282        <synchManagerUri>@synchServiceManager@</synchManagerUri> 
     83         
     84        <!-- This must match the connector id in the synch config.  
     85             It identifies which connection we are using for communication 
     86             with the synch engine. 
     87          --> 
     88        <synchConnectorId>localBedework</synchConnectorId> 
    8389 
    8490        <!-- To enable mapping of calendar addresses e.g. mailto:fred@example.org 
    …… 
    539545           
    540546          <!-- Where the browser finds css and other resources -->     
    541           <browserResourceRoot>http://localhost:8080/caladminrsrc</browserResourceRoot> 
     547          <browserResourceRoot>/caladminrsrc</browserResourceRoot> 
    542548           
    543549          <!-- Where the server finds xsl etc -->     
    …… 
    572578 
    573579          <!-- Where the browser finds css and other resources -->     
    574           <browserResourceRoot>http://localhost:8080/eventsubmitrsrc</browserResourceRoot> 
     580          <browserResourceRoot>/eventsubmitrsrc</browserResourceRoot> 
    575581           
    576582          <!-- Where the server finds xsl etc -->     
    …… 
    608614 
    609615          <!-- Where the browser finds css and other resources -->     
    610           <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     616          <browserResourceRoot>/calrsrc</browserResourceRoot> 
    611617           
    612618          <!-- Where the server finds xsl etc -->     
    …… 
    646652 
    647653          <!-- Where the browser finds css and other resources -->     
    648           <browserResourceRoot>http://localhost:8080/calfeedrsrc</browserResourceRoot> 
     654          <browserResourceRoot>/calfeedrsrc</browserResourceRoot> 
    649655           
    650656          <!-- Where the server finds xsl etc -->     
    …… 
    684690 
    685691          <!-- Where the browser finds css and other resources -->     
    686           <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     692          <browserResourceRoot>/calrsrc</browserResourceRoot> 
    687693           
    688694          <!-- Where the server finds xsl etc -->     
    …… 
    719725 
    720726          <!-- Where the browser finds css and other resources -->     
    721           <browserResourceRoot>http://localhost:8080/ucalrsrc</browserResourceRoot> 
     727          <browserResourceRoot>/ucalrsrc</browserResourceRoot> 
    722728           
    723729          <!-- Where the server finds xsl etc -->     

  • releases/bedework-3.8/deployment/bw-core-appjars.xml

    r3322 r3390  
    222222      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    223223              libcache="${org.bedework.libcache.dir}" 
    224               name="commons-lang" version="2.1"/> 
     224              name="commons-lang" version="2.6"/> 
    225225 
    226226      <getJar lib="${org.bedework.temp.extrajars.dir}"