Changeset 2812

Show
Ignore:
Timestamp:
02/23/10 15:58:03
Author:
douglm
Message:

Monitor: generate stats in a different format - perhaps more usable for applications

Create a derby mbean so we can run derby as a service with network connections

Fix up build to copy appropriate files into server lib

Add some (currently unused) alarm code from trunk.

Fix eclipse settings and undo the adds of some "final "

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.6/build.xml

    r2806 r2812  
    714714          file="${org.bedework.config.options}" /> 
    715715 
     716    <copy tofile="${app.dest.properties}/sysevents.properties" 
     717          file="${org.bedework.config.sysevents.properties}" /> 
     718 
    716719    <path id="run.classpath"> 
    717720      <fileset dir="${org.bedework.project.bedework}/applib"> 

  • releases/bedework-3.6/config/bwbuild/jboss/cal.properties

    r2797 r2812  
    3333org.bedework.global.hibernate.dialect=org.bedework.calcore.DerbyDialect 
    3434 
    35 # Parameters for shell apps - set the db name in the url below 
    36 org.bedework.global.jdbcdriver=org.apache.derby.jdbc.ClientDriver 
    37 org.bedework.global.jdbcurl="jdbc:derby://localhost:1527/bedework3p6 
    38 org.bedework.global.jdbcid=sa 
    39 org.bedework.global.jdbcpw= 
    40  
    4135# DB Datasource for jboss services 
    4236# There doesn't appear to be the extra level of indirection that the jboss-web.xml 
    …… 
    9488org.bedework.jquery.dir=jquery 
    9589 
     90# ------------------------------------------------------------------------ 
     91# Extra jars 
     92# ------------------------------------------------------------------------ 
     93# 
    9694# A place to put extra jars and files, e.g. jdbc drivers. 
    9795# This can be directed at any local directory 
    9896# 
    99 # There can be three directories inside this, jdbc, shell and war. 
     97# There can be three directories inside this, server, shell and war. 
    10098# org.bedework.global.ext.lib=${org.bedework.config.home}/lib 
     99 
     100# A list of jars to copy, delimited by "," 
     101org.bedework.global.extra.jars=${org.bedework.project.bedework}/projects/rpiutil/dist/rpiutil-3.6.jar 
    101102 
    102103# ------------------------------------------------------------------------ 
    …… 
    135136#  Set to yes if you want your log4j.xml overwritten 
    136137org.bedework.deploy.log4j.config=no 
     138 
     139# ------------------------------------------------------------------------ 
     140# Parameters for shell apps - set the db name in the url below 
     141# ------------------------------------------------------------------------ 
     142 
     143org.bedework.global.jdbcdriver=org.apache.derby.jdbc.ClientDriver 
     144org.bedework.global.jdbcurl="jdbc:derby://localhost:1527/${org.bedework.jboss.data.dir}/derby/CalDb3p6 
     145org.bedework.global.jdbcid=sa 
     146org.bedework.global.jdbcpw= 
     147 
     148#org.bedework.global.jdbcdriver=org.apache.derby.jdbc.EmbeddedDriver 
     149#org.bedework.global.jdbcurl=jdbc:derby:${org.bedework.jboss.data.dir}/derby/CalDb3p6 
     150#org.bedework.global.jdbcid=sa 
     151#org.bedework.global.jdbcpw= 
    137152 
    138153# ------------------------------------------------------------------------ 

  • releases/bedework-3.6/deployment/build.xml

    r2737 r2812  
    237237    <!-- copy jdbc jar so datasources work --> 
    238238    <if> 
    239       <available file="${org.bedework.global.ext.lib}/jdbc" type="dir" /> 
     239      <available file="${org.bedework.global.ext.lib}/server" type="dir" /> 
    240240      <then> 
    241241        <!-- jdbc drivers --> 
    242242        <copy todir="${appserver.lib.dir}" flatten="yes" > 
    243243          <!-- local jdbc drivers --> 
    244           <fileset dir="${org.bedework.global.ext.lib}/jdbc"> 
     244          <fileset dir="${org.bedework.global.ext.lib}/server"> 
    245245            <include name="*.jar"/> 
    246246          </fileset> 
    247247        </copy> 
    248248      </then> 
    249       <else> 
    250         <!-- Include the quickstart jdbc driver --> 
    251         <copy todir="${appserver.lib.dir}" file="${org.bedework.appjar.hsqldb}"/> 
    252       </else> 
     249    </if> 
     250         
     251        <if> 
     252      <isset property="org.bedework.global.extra.jars" /> 
     253      <then> 
     254        <foreach list="${org.bedework.global.extra.jars}" 
     255                 target="copyToServer" 
     256                 param="org.bedework.extra.jar" 
     257                 inheritall="true" 
     258                 trim="true" /> 
     259      </then> 
    253260    </if> 
    254261 
    …… 
    260267    </if> 
    261268  </target> 
     269         
     270        <target name="copyToServer"> 
     271    <copy todir="${appserver.lib.dir}" file="${org.bedework.extra.jar}" /> 
     272        </target> 
    262273 
    263274  <!-- =================================================================