Changeset 2291

Show
Ignore:
Timestamp:
07/21/09 13:37:58
Author:
douglm
Message:

Simplify notification classes and implement a jms notifications handler.

This requires activemq to be running

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/douglm/build/buildsh.xml

    r2141 r2291  
    6262    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" /> 
    6363    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" /> 
     64 
     65    <!-- jms support --> 
     66    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" /> 
     67    <copy todir="${app.dest.lib}" 
     68          file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" /> 
     69    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" /> 
    6470 
    6571    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/> 

  • branches/douglm/build/buildwar.xml

    r2249 r2291  
    249249    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" /> 
    250250    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" /> 
     251 
     252        <!-- jms support --> 
     253    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" /> 
     254    <copy todir="${app.dest.lib}" 
     255            file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" /> 
     256    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" /> 
    251257 
    252258    <antcall target="bexchange-stuff" inheritRefs="true" /> 

  • branches/douglm/build/quickstart/build.xml

    r2107 r2291  
    1616  <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
    1717 
     18  <import file="${bedework.quickstart.basedir}/run-activemq.xml" /> 
    1819  <import file="${bedework.quickstart.basedir}/run-hsqldb.xml" /> 
    1920  <import file="${bedework.quickstart.basedir}/run-tomcat.xml" /> 
    …… 
    239240          description="Start quickstart system" > 
    240241    <parallel> 
     242      <antcall target="activemq" inheritrefs="true" /> 
    241243      <antcall target="dirstart" inheritrefs="true" /> 
    242244      <antcall target="hsqldb" inheritrefs="true" /> 
    …… 
    257259          description="Start quickstart system" > 
    258260    <parallel> 
     261      <antcall target="activemq" inheritrefs="true" /> 
    259262      <antcall target="dirstart" inheritrefs="true" /> 
    260263      <antcall target="hsqldb" inheritrefs="true" /> 

  • branches/douglm/build/quickstart/run-hsqldb.xml

    r1937 r2291  
    3636  <target name="hsqldb" depends="hsql.init" 
    3737          description="starts the hsqldb server"> 
     38    <echo message="************************************************************"/> 
    3839    <echo message="Starting hsqldb on port ${org.bedework.hsqldb.port}"/> 
     40    <echo message="************************************************************"/> 
    3941 
    4042    <java fork="true" dir="${basedir}" classname="org.hsqldb.Server"> 
    …… 
    120122  <target name="hsqldb-test" depends="hsql.init" 
    121123          description="starts the hsqldb server for testing"> 
     124    <echo message="************************************************************"/> 
    122125    <echo message="Starting hsqldb on port ${org.bedework.hsqldb.port}"/> 
     126    <echo message="************************************************************"/> 
    123127 
    124128    <delete dir="${org.bedework.hsqldb.dbdir}" /> 
    …… 
    137141  <target name="hsqldb-test-trace" depends="hsql.init" 
    138142          description="starts the hsqldb server for testing"> 
     143    <echo message="************************************************************"/> 
    139144    <echo message="Starting hsqldb on port ${org.bedework.hsqldb.port}"/> 
     145    <echo message="************************************************************"/> 
    140146 
    141147    <delete dir="${org.bedework.hsqldb.dbdir}" /> 

  • branches/douglm/config/bwbuild/default/context.xml

    r1992 r2291  
    11<Context path="@CONTEXT-ROOT@" reloadable="false"> 
    22  <!-- Resource referenced by web.xml --> 
    3  <Resource name="jdbc/calDB" auth="Container" 
    4            type="javax.sql.DataSource" 
    5            driverClassName="org.hsqldb.jdbcDriver" 
    6            url="jdbc:hsqldb:hsql://localhost:8887" 
    7            username="sa" 
    8            password="" 
    9            maxActive="8" 
    10            maxIdle="4" 
    11            maxWait="-1" 
    12            defaultAutoCommit="false" /> 
     3  <Resource name="jdbc/calDB" auth="Container" 
     4            type="javax.sql.DataSource" 
     5            driverClassName="org.hsqldb.jdbcDriver" 
     6            url="jdbc:hsqldb:hsql://localhost:8887" 
     7            username="sa" 
     8            password="" 
     9            maxActive="8" 
     10            maxIdle="4" 
     11            maxWait="-1" 
     12            defaultAutoCommit="false" /> 
     13 
     14  <!-- ActiveMQ ConnectionFactory --> 
     15  <Resource name="jms/BedeworkConnectionFactory" 
     16            auth="Container" 
     17            type="org.apache.activemq.ActiveMQConnectionFactory" 
     18            description="JMS Connection Factory" 
     19            factory="org.apache.activemq.jndi.JNDIReferenceFactory" 
     20            brokerURL="tcp://localhost:61616?trace=true" 
     21            brokerName="LocalActiveMQBroker"/> 
     22 
     23  <!-- ActiveMQ Ssytem events queue --> 
     24  <Resource name="queue/sysevents" 
     25            auth="Container" 
     26            type="org.apache.activemq.command.ActiveMQQueue" 
     27            description="Bedework crawler queue" 
     28            factory="org.apache.activemq.jndi.JNDIReferenceFactory" 
     29            physicalName="HibernateSearchController"/> 
    1330 
    1431  <!-- Disables restart persistence of sessions --> 

  • branches/douglm/deployment/appjars.xml

    r2141 r2291  
    184184              name="commons-ssl" /> 
    185185 
     186      <!-- Jms support --> 
     187 
     188      <getJar lib="${org.bedework.app.lib}" 
     189              name="activemq-core" version="5.2.0" /> 
     190 
     191      <getJar lib="${org.bedework.app.lib}" 
     192              name="geronimo-j2ee-management_1.0_spec" version="1.0" /> 
     193 
     194      <getJar lib="${org.bedework.app.lib}" 
     195              name="jms" version="1.1" /> 
     196 
    186197      <!-- Various apis --> 
    187198