Changeset 3395

Show
Ignore:
Timestamp:
11/16/11 14:17:02
Author:
douglm
Message:

Turn on use of synch engine in 3.8

Use the beans config to provide initial values for a config stored in the db.

Add a ToString? class to rpiutil

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r3390 r3395  
    1010 
    1111        <!-- Temp value to enable/disable the use of the synch service --> 
    12         <doWeSynch>false</doWeSynch> 
     12        <doWeSynch>true</doWeSynch> 
    1313         
    1414        <!-- This property is how the running system finds the system settings. 
    …… 
    798798          <!-- Comment out or delete for no web calendar service --> 
    799799          <webcalServiceURI>/webcal</webcalServiceURI> 
     800 
     801          <!-- The bedework end of the synch service. This is a web 
     802               service called by the synch engine to get information out of 
     803               bedework and to update events and status. 
     804                
     805               This path should probably be restricted to a given host only. 
     806                
     807               Coming up on a separate port might help to lock it down. 
     808               Comment out or delete for no synch service  
     809               --> 
     810          <synchWsURI>/synchws/</synchWsURI> 
    800811        </Pubcaldav> 
    801812 

  • releases/bedework-3.8/config/bwbuild/.defaults/cal.properties

    r3366 r3395  
    7272org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS 
    7373org.bedework.global.jboss.tzdb.datasource.jndiname=/TzDS 
     74org.bedework.global.jboss.synch.datasource.jndiname=/SynchDS 
    7475 
    7576# Hibernate caching parameters 
    …… 
    175176# The log4j config file destination 
    176177org.bedework.log4j.config=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf/jboss-log4j.xml 
    177 # 
     178 
    178179# If set to true or yes will copy in the bedework db datasource def bedework-ds.xml 
    179180org.bedework.global.copy.bedeworkds.config=yes 
    180 # 
     181 
    181182# If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml 
    182183org.bedework.global.copy.bedeworkcardds.config=yes 
    183 # 
     184 
    184185# If set to true or yes will copy in the bedework tz db datasource def bedework-ds.xml 
    185186org.bedework.global.copy.bedeworktzds.config=yes 
     187 
     188# If set to true or yes will copy in the bedework synch db datasource def  
     189org.bedework.global.copy.bedeworksynchds.config=yes 
    186190 
    187191# If set to true or yes will build the web (CASifiable) version of carddav also  
    …… 
    217221org.bedework.exchange.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/exchange 
    218222 
     223# ------------------------------------------------------------------------ 
     224#                  synch 
     225 
    219226# synch - wsdl where we deploy for the build. 
    220227org.bedework.synch.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/synch 
     228 
     229#              where running services download it. 
     230org.bedework.synch.wsdl.uri=http://localhost:8080/wsdls/synch/wssvc.wsdl 
     231 
     232# synch - service 
     233org.bedework.synch.service.context=/synch 
     234org.bedework.synch.service=http://localhost:8080${org.bedework.synch.service.context} 
     235# synch - service - manager - this correcsponds to the manager connector  
     236#         configured into the synch service byt its own config. 
     237org.bedework.synch.service.manager=${org.bedework.synch.service}/manager 
     238 
     239# Bedework end of the synch service - a separate context on pubcaldav 
     240org.bedework.bwsynch.wsuri=/synchws/ 
     241org.bedework.bwsynch.service=http://localhost:8080/pubcaldav${org.bedework.bwsynch.wsuri} 
    221242 
    222243# 

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

    r3392 r3395  
    88       Synch engine configuration 
    99        
    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. 
     10       NOTE: This is a one time initial configuration. It is used to populate 
     11       classes when the synch engine configuration database is uninitialized. 
     12        
     13       Once it has been initialized at startup use the jmx console to change 
     14       the configuration. This should be an infrequent occurrence 
    1415       ===================================================================== --> 
    1516  <bean id="synchConfig"  
    16         class="org.bedework.synch.SynchConfig"> 
     17        class="org.bedework.synch.db.SynchConfig"> 
    1718    <!-- Size of synchling pool. This effectively limits the number of  
    1819         concurrent threads processing synch actions  -->  
    …… 
    5758          For example we could have two bedework connectors to allow synch 
    5859          between the local bedework and some other remote bedework. 
    59      -->                
     60     --> 
    6061    <property name="connectors"> 
    61       <map> 
    62         <!-- manager is a special connector which provides a way of 
    63              communicating with the synch engine. There must always be 
    64              one, and only one, of this class. --> 
    65         <entry key="manager"  
    66                value="org.bedework.synch.cnctrs.manager.SynchConnector" /> 
    67  
    68         <!-- An exchange connector -->                
    69         <entry key="exdemo"  
    70                value="org.bedework.synch.cnctrs.exchange.ExchangeConnector" /> 
    71  
    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"  
    77                value="org.bedework.synch.cnctrs.bedework.BedeworkConnector" /> 
    78  
    79         <!-- A file connector -->                
    80         <entry key="read-only-file"  
    81                value="org.bedework.synch.cnctrs.file.FileConnector" /> 
    82       </map> 
     62      <set> 
     63        <ref bean="manager"/>      
     64        <ref bean="exdemo"/>      
     65        <ref bean="localBedework" /> 
     66        <ref bean="read-only-file" /> 
     67      </set> 
    8368    </property> 
    8469  </bean> 
    8570 
    86   <!-- The connector "exdemo" will load the following config -  
    87        the suffix "ExchangeConfig" is appended to the connector id --> 
    88   <bean id="exdemoExchangeConfig"  
    89         class="org.bedework.synch.cnctrs.exchange.ExchangeConnectorConfig"> 
     71  <!-- The manager is a special connector which provides a way of 
     72       communicating with the synch engine. There must always be 
     73       one, and only one, of this class. --> 
     74  <bean id="manager"  
     75        class="org.bedework.synch.db.ConnectorConfig"> 
     76    <property name="name" value="manager" /> 
     77    <property name="className"  
     78              value="org.bedework.synch.cnctrs.manager.SynchConnector" /> 
     79               
     80    <property name="readOnly" value="false" /> 
     81 
     82    <property name="trustLastmod" value="true" /> 
     83  </bean> 
     84 
     85  <!-- An exchange connector  --> 
     86  <bean id="exdemo"  
     87        class="org.bedework.synch.db.ConnectorConfig"> 
     88    <property name="name" value="exdemo" /> 
     89    <property name="className" 
     90              value="org.bedework.synch.cnctrs.exchange.ExchangeConnector" /> 
     91               
    9092    <property name="readOnly" value="false" /> 
    9193 
    9294    <property name="trustLastmod" value="true" /> 
    9395 
    94     <!-- location of the WSDL - modified to include server element  
    95          This corresponds to the wsdl deploy location defined in the 
    96         build properties file. 
    97     --> 
    98     <property name="exchangeWSDLURI" 
    99               value="http://localhost:8080/wsdls/exchange/Services.wsdl" /> 
    100               <!--  
    101     <property name="props"> 
    102       <props> 
    103         <prop key="x1">y1</prop> 
    104         <prop key="x2">y2</prop> 
    105       </props> 
     96    <property name="properties"> 
     97      <set> 
     98        <!-- location of the WSDL - modified to include server element  
     99             This corresponds to the wsdl deploy location defined in the 
     100             build properties file. 
     101        --> 
     102        <bean class="org.bedework.synch.db.SynchProperty"> 
     103          <property name="name" value="exchangeWSDLURI" /> 
     104          <property name="value"  
     105                    value="http://localhost:8080/wsdls/exchange/Services.wsdl" /> 
     106        </bean> 
     107      </set> 
    106108    </property> 
    107      --> 
    108109  </bean> 
    109110   
    110   <!-- The connector "localBedework" will load the following config -  
    111        the suffix "BedeworkConfig" is appended to the connector id --> 
    112   <bean id="localBedeworkBedeworkConfig"  
    113         class="org.bedework.synch.cnctrs.bedework.BedeworkConnectorConfig"> 
     111  <!-- A local bedework connector. This handles connections to the local 
     112       bedework system. This name is configured in to bedework so that 
     113       it can locate its own connections.  
     114    -->                
     115  <bean id="localBedework"  
     116        class="org.bedework.synch.db.ConnectorConfig"> 
     117    <property name="name" value="localBedework" /> 
     118    <property name="className" 
     119              value="org.bedework.synch.cnctrs.bedework.BedeworkConnector" /> 
     120     
    114121    <property name="readOnly" value="false" /> 
    115122 
    116123    <property name="trustLastmod" value="true" /> 
    117124 
    118     <!-- location of the WSDL for the remote web service  
    119          This corresponds to the wsdl deploy location defined in the 
    120          build properties file. 
    121     --> 
    122     <property name="bwWSDLURI" 
    123               value="http://localhost:8080/wsdls/synch/wssvc.wsdl" /> 
     125    <property name="properties"> 
     126      <set> 
     127        <!-- location of the WSDL for the remote web service  
     128             This corresponds to the wsdl deploy location defined in the 
     129             build properties file. 
     130        --> 
     131        <bean class="org.bedework.synch.db.SynchProperty"> 
     132          <property name="name" value="bwWSDLURI" /> 
     133          <property name="value"  
     134                    value="http://localhost:8080/wsdls/synch/wssvc.wsdl" /> 
     135        </bean> 
     136                   
     137        <!-- seconds before retry on failure  -->  
     138        <bean class="org.bedework.synch.db.SynchProperty"> 
     139          <property name="name" value="retryInterval"/> 
     140          <property name="value"  
     141                    value="10" /> 
     142        </bean> 
    124143               
    125     <!-- seconds before retry on failure  -->  
    126     <property name="retryInterval" 
    127               value="10" /> 
    128                
    129     <!-- seconds before we ping just to say we're still around -->  
    130     <property name="keepAliveInterval" 
    131               value="300" /> 
     144        <!-- seconds before we ping just to say we're still around -->  
     145        <bean class="org.bedework.synch.db.SynchProperty"> 
     146          <property name="name" value="keepAliveInterval" /> 
     147          <property name="value"  
     148                    value="300" /> 
     149        </bean> 
     150      </set> 
     151    </property> 
    132152  </bean> 
    133153   
    134   <!-- The connector "read-only-file" will load the following config -  
    135        the suffix "FileConfig" is appended to the connector id --> 
    136   <bean id="read-only-fileFileConfig"  
    137         class="org.bedework.synch.cnctrs.file.FileConnectorConfig"> 
     154  <!-- The connector "read-only-file" will allow subscriptions with ics files --> 
     155  <bean id="read-only-file"  
     156        class="org.bedework.synch.db.ConnectorConfig"> 
     157    <property name="name" value="read-only-file" /> 
     158    <property name="className" 
     159              value="org.bedework.synch.cnctrs.file.FileConnector" /> 
     160 
    138161    <property name="readOnly" value="true" /> 
    139162 
    140163    <property name="trustLastmod" value="false" /> 
    141164 
    142     <!-- seconds  -->  
    143     <property name="minPoll" value="15" /> 
     165    <property name="properties"> 
     166      <set> 
     167        <!-- seconds  -->  
     168        <bean class="org.bedework.synch.db.SynchProperty"> 
     169          <property name="name" value="minPoll" /> 
     170          <property name="value"  
     171                    value="15" /> 
     172        </bean> 
     173      </set> 
     174    </property> 
    144175  </bean> 
    145176</beans> 

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

    r3368 r3395  
    77org.bedework.global.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect 
    88 
    9 org.bedework.global.jboss.synch.datasource.jndiname=/SynchDS 
    10  
    119# True if this is a primary server  
    1210org.bedework.app.tzsvr.primary.server=true 
    13  
    14 # 
    15 # If set to true or yes will copy in the bedework synch db datasource def  
    16 org.bedework.global.copy.bedeworksynchds.config=yes 
    17 #              where running services download it. 
    18 org.bedework.synch.wsdl.uri=http://localhost:8080/wsdls/synch/wssvc.wsdl 
    19  
    20 # synch - service 
    21 org.bedework.synch.service.context=/synch 
    22 org.bedework.synch.service=http://localhost:8080${org.bedework.synch.service.context} 
    23 # synch - service - manager - this correcsponds to the manager connector  
    24 #         configured into the synch service byt its own config. 
    25 org.bedework.synch.service.manager=${org.bedework.synch.service}/manager 
    26  
    27 # Bedework end of the synch service - a separate context on pubcaldav 
    28 org.bedework.bwsynch.wsuri=/synchws/ 
    29 org.bedework.bwsynch.service=http://localhost:8080/pubcaldav${org.bedework.bwsynch.wsuri}