Changeset 3095

Show
Ignore:
Timestamp:
12/14/10 10:04:48
Author:
douglm
Message:

Propagate change to activemq config to avoid producer delays.

Change to build of services to allow specification of no default libraries. Requires services to specify explicitly the libraries they need in their deployment appjars.xml file. Chnage configs and appjars for sysevlog, monitor and genkeys. Significantly reduces number of jars loaded.

Fix genkeys config - it specified the monitor classloader repository

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.7/build/platforms/jbossService.xml

    r2955 r3095  
    5252      <else> 
    5353        <!-- Library in sar file --> 
    54         <property name="app.dest.lib" 
    55                   location="${app.dest.webinf}/lib" /> 
    56         <antcall target="copyLibs" inheritRefs="true" /> 
     54        <copy todir="${app.dest.lib}" > 
     55          <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
     56        </copy> 
     57         
     58        <if> 
     59          <not> 
     60            <isset property="propval.app.no.defaultlibs" /> 
     61          </not> 
     62          <then> 
     63            <property name="app.dest.lib" 
     64                      location="${app.dest.webinf}/lib" /> 
     65            <antcall target="copyLibs" inheritRefs="true" /> 
     66          </then> 
     67        </if> 
    5768      </else> 
    5869    </if> 

  • releases/bedework-3.7/config/bwbuild/default/activemq-broker-config.xml

    r3014 r3095  
    101101      <policyMap> 
    102102        <policyEntries> 
    103           <policyEntry queue=">" memoryLimit="5mb" /> 
     103          <policyEntry queue=">" producerFlowControl="false" 
     104            memoryLimit="64mb" /> 
    104105          <policyEntry topic=">" memoryLimit="5mb"> 
    105106            <!-- 

  • releases/bedework-3.7/config/bwbuild/default/cal.properties

    r3070 r3095  
    504504org.bedework.app.sysevlog.zip.name=bwsysevlog 
    505505org.bedework.app.sysevlog.description=Bedework system events logger application 
     506org.bedework.app.sysevlog.no.defaultlibs=true 
    506507 
    507508# 
    …… 
    517518org.bedework.app.monitor.zip.name=monitor 
    518519org.bedework.app.monitor.description=Bedework system events monitor application 
     520org.bedework.app.monitor.no.defaultlibs=true 
    519521 
    520522# 
    …… 
    530532org.bedework.app.genkeys.zip.name=genkeys 
    531533org.bedework.app.genkeys.description=Bedework system Key generator 
     534org.bedework.app.genkeys.no.defaultlibs=true 
    532535 
    533536# 

  • releases/bedework-3.7/config/bwbuild/jboss-h2/activemq-broker-config.xml

    r2983 r3095  
    8585              <queue physicalName="bedework.sysevents.monitor" /> 
    8686              <queue physicalName="bedework.crawler" /> 
    87               <filteredDestination selector="inbox = 'true'" 
     87              <filteredDestination selector="inbox = 'true' or scheduleEvent = 'true'" 
    8888                                   queue="bedework.scheduleIn"/> 
    8989              <filteredDestination selector="outbox = 'true'" 
    …… 
    101101      <policyMap> 
    102102        <policyEntries> 
    103           <policyEntry queue=">" memoryLimit="5mb" /> 
     103          <policyEntry queue=">" producerFlowControl="false" 
     104            memoryLimit="64mb" /> 
    104105          <policyEntry topic=">" memoryLimit="5mb"> 
    105106            <!-- 

  • releases/bedework-3.7/config/bwbuild/jboss-mysql/activemq-broker-config.xml

    r2983 r3095  
    8585              <queue physicalName="bedework.sysevents.monitor" /> 
    8686              <queue physicalName="bedework.crawler" /> 
    87               <filteredDestination selector="inbox = 'true'" 
     87              <filteredDestination selector="inbox = 'true' or scheduleEvent = 'true'" 
    8888                                   queue="bedework.scheduleIn"/> 
    8989              <filteredDestination selector="outbox = 'true'" 
    …… 
    101101      <policyMap> 
    102102        <policyEntries> 
    103           <policyEntry queue=">" memoryLimit="5mb" /> 
     103          <policyEntry queue=">" producerFlowControl="false" 
     104            memoryLimit="64mb" /> 
    104105          <policyEntry topic=">" memoryLimit="5mb"> 
    105106            <!-- 

  • releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.properties

    r3001 r3095  
    499499org.bedework.app.sysevlog.zip.name=bwsysevlog 
    500500org.bedework.app.sysevlog.description=Bedework system events logger application 
     501org.bedework.app.sysevlog.no.defaultlibs=true 
    501502 
    502503# 
    …… 
    512513org.bedework.app.monitor.zip.name=monitor 
    513514org.bedework.app.monitor.description=Bedework system events monitor application 
     515org.bedework.app.monitor.no.defaultlibs=true 
    514516 
    515517# 
    …… 
    525527org.bedework.app.genkeys.zip.name=genkeys 
    526528org.bedework.app.genkeys.description=Bedework system Key generator 
     529org.bedework.app.genkeys.no.defaultlibs=true 
    527530 
    528531# 

  • releases/bedework-3.7/config/bwbuild/jboss-postgresql/activemq-broker-config.xml

    r2994 r3095  
    101101      <policyMap> 
    102102        <policyEntries> 
    103           <policyEntry queue=">" memoryLimit="5mb" /> 
     103          <policyEntry queue=">" producerFlowControl="false" 
     104            memoryLimit="64mb" /> 
    104105          <policyEntry topic=">" memoryLimit="5mb"> 
    105106            <!-- 

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

    r3061 r3095  
    153153org.bedework.global.copy.bedeworkcardds.config=yes 
    154154# 
    155 # If set to true or yes will copy in the bedework exchnage synch db datasource def  
     155# If set to true or yes will copy in the bedework exchange synch db datasource def  
    156156org.bedework.global.copy.bedeworkexsynchds.config=yes 
    157157 
    …… 
    555555org.bedework.app.sysevlog.zip.name=bwsysevlog 
    556556org.bedework.app.sysevlog.description=Bedework system events logger application 
     557org.bedework.app.sysevlog.no.defaultlibs=true 
    557558 
    558559# 
    …… 
    568569org.bedework.app.monitor.zip.name=monitor 
    569570org.bedework.app.monitor.description=Bedework system events monitor application 
     571org.bedework.app.monitor.no.defaultlibs=true 
    570572 
    571573# 
    …… 
    581583org.bedework.app.genkeys.zip.name=genkeys 
    582584org.bedework.app.genkeys.description=Bedework system Key generator 
     585org.bedework.app.genkeys.no.defaultlibs=true 
    583586 
    584587# 

  • releases/bedework-3.7/deployment/genkeys/shellscr/META-INF/jboss-service.xml

    r3001 r3095  
    33  <!--  guarantee separate classloader --> 
    44  <loader-repository>  
    5     org.bedework:archive=monitor-service  
     5    org.bedework:archive=genkeys-service  
    66  </loader-repository>  
    77   

  • releases/bedework-3.7/deployment/genkeys/shellscr/appjars.xml

    r3055 r3095  
    1010      <mkdir dir="${org.bedework.temp.extrajars.dir}" /> 
    1111 
     12      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     13              libcache="${org.bedework.libcache.dir}" 
     14              name="bw-calfacade" version="${org.bedework.calendarapi.version}" 
     15              projecthome="${bw.project.home}/projects/calendarapi" /> 
     16 
     17      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     18              libcache="${org.bedework.libcache.dir}" 
     19              name="rpiutil" version="${org.bedework.rpiutil.version}" project="rpiutil" 
     20              projecthome="${bw.project.home}/projects/rpiutil" /> 
     21 
     22      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     23              libcache="${org.bedework.libcache.dir}" 
     24              name="commons-codec" version="1.3"/> 
     25       
    1226    </sequential> 
    1327 </macrodef> 

  • releases/bedework-3.7/deployment/monitor/shellscr/appjars.xml

    r3055 r3095  
    99      <delete dir="${org.bedework.temp.extrajars.dir}" /> 
    1010      <mkdir dir="${org.bedework.temp.extrajars.dir}" /> 
     11         
     12      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     13              libcache="${org.bedework.libcache.dir}" 
     14              name="bw-sysevents" version="${org.bedework.calendarapi.version}" 
     15              projecthome="${bw.project.home}/projects/calendarapi" /> 
     16 
     17      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     18              libcache="${org.bedework.libcache.dir}" 
     19              name="rpiaccess"  
     20              version="${org.bedework.access.version}" project="access" 
     21              projecthome="${bw.project.home}/projects/access" /> 
    1122 
    1223    </sequential> 

  • releases/bedework-3.7/deployment/sysevlog/shellscr/appjars.xml

    r3055 r3095  
    99      <delete dir="${org.bedework.temp.extrajars.dir}" /> 
    1010      <mkdir dir="${org.bedework.temp.extrajars.dir}" /> 
     11       
     12      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     13              libcache="${org.bedework.libcache.dir}" 
     14              name="bw-sysevents" version="${org.bedework.calendarapi.version}" 
     15              projecthome="${bw.project.home}/projects/calendarapi" /> 
    1116 
    1217      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1318              libcache="${org.bedework.libcache.dir}" 
    14               name="bw-cdvutil" version="${org.bedework.caldav.version}" 
    15               projecthome="${bw.project.home}/projects/caldav" /> 
     19              name="rpiaccess"  
     20              version="${org.bedework.access.version}" project="access" 
     21              projecthome="${bw.project.home}/projects/access" /> 
    1622 
    17         <!-- 
    18       <getJar lib="${org.bedework.temp.extrajars.dir}" 
    19               libcache="${org.bedework.libcache.dir}" 
    20               name="bw-crawler" version="3.6" 
    21               projecthome="${bw.project.home}/projects/bwcrawler" /> 
    22         --> 
    2323    </sequential> 
    2424 </macrodef>