Changeset 3098

Show
Ignore:
Timestamp:
12/14/10 13:14:59
Author:
douglm
Message:

Add some system timer logging via jms.

Change proeprties to define destination of log4j config file.

Add new target to allow deployment of log4j configuration.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/quickstart/build.xml

    r2560 r3098  
    136136    <ant antfile="${bedework.build.file}" inheritrefs="true" 
    137137           target="clean.build" /> 
     138  </target> 
     139 
     140  <!-- ================================================================= 
     141       "deploy.log4j" target 
     142       ================================================================= --> 
     143 
     144  <target name="deploy.log4j" depends="init" 
     145          description="Copy the log4j config into the appserver"> 
     146    <loadDeployConfig /> 
     147 
     148    <copy tofile="${org.bedework.log4j.config}"  
     149          file="${org.bedework.config.home}/log4j.xml" 
     150            overwrite="true" /> 
    138151  </target> 
    139152 

  • trunk/config/bwbuild/default/build.properties

    r3059 r3098  
    33# 
    44# Configure a build of a demo calendar running on bedework.org. 
    5 # 
    6 # This file gives users the opportunity to override properties that will be 
    7 # defined later in the build process. 
    8 # The order of loading is: 
    9 #   <home-dir>/bedework.build.properties  (this file) 
    10 #   local.build.properties 
    11 #   <various other distributed properties> 
    12 # 
    13 # Therefore add individual developer overrrides to <home-dir>/bedework.build.properties 
    145# 
    156 
    …… 
    4031org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml 
    4132 
    42 # Enable/disable replacement of log4j config during deployment 
    43 org.bedework.deploy.log4j.config=no 
    44  

  • trunk/config/bwbuild/default/cal.properties

    r3096 r3098  
    129129appserver.lib.dir=${org.bedework.jboss.config.dir}/lib 
    130130 
    131 # where things like log4j config files go 
     131# where data files go 
    132132org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 
    133133org.bedework.data.dir=${org.bedework.jboss.data.dir} 
    …… 
    141141org.bedework.server.resource.root.dir=server/${org.bedework.jboss.config}/deploy/ROOT.war 
    142142 
    143 # where things like log4j config files go 
    144 log4j.config.destination=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf 
    145  
    146 #  Set to yes if you want your log4j.xml overwritten 
    147 org.bedework.deploy.log4j.config=no 
     143# The log4j config file destination 
     144org.bedework.log4j.config=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf/jboss-log4j.xml 
    148145# 
    149146# If set to true or yes will copy in the bedework db datasource def bedework-ds.xml 

  • trunk/config/bwbuild/jboss-h2/build.properties

    r3059 r3098  
    33# 
    44# Configure a build of a demo calendar running on bedework.org. 
    5 # 
    6 # This file gives users the opportunity to override properties that will be 
    7 # defined later in the build process. 
    8 # The order of loading is: 
    9 #   <home-dir>/bedework.build.properties  (this file) 
    10 #   local.build.properties 
    11 #   <various other distributed properties> 
    12 # 
    13 # Therefore add individual developer overrrides to <home-dir>/bedework.build.properties 
    145# 
    156 
    …… 
    4031org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml 
    4132 
    42 # Enable/disable replacement of log4j config during deployment 
    43 org.bedework.deploy.log4j.config=no 
    44  

  • trunk/config/bwbuild/jboss-h2/cal.properties

    r3001 r3098  
    122122appserver.lib.dir=${org.bedework.jboss.config.dir}/lib 
    123123 
    124 # where things like log4j config files go 
     124# where data files go 
    125125org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 
    126126org.bedework.data.dir=${org.bedework.jboss.data.dir} 
    …… 
    134134org.bedework.server.resource.root.dir=server/${org.bedework.jboss.config}/deploy/ROOT.war 
    135135 
    136 # where things like log4j config files go 
    137 log4j.config.destination=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf 
    138  
    139 #  Set to yes if you want your log4j.xml overwritten 
    140 org.bedework.deploy.log4j.config=no 
     136# The log4j config file destination 
     137org.bedework.log4j.config=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf/jboss-log4j.xml 
    141138 
    142139# ------------------------------------------------------------------------ 

  • trunk/config/bwbuild/jboss-mysql/build.properties

    r3059 r3098  
    33# 
    44# Configure a build of a demo calendar running on bedework.org. 
    5 # 
    6 # This file gives users the opportunity to override properties that will be 
    7 # defined later in the build process. 
    8 # The order of loading is: 
    9 #   <home-dir>/bedework.build.properties  (this file) 
    10 #   local.build.properties 
    11 #   <various other distributed properties> 
    12 # 
    13 # Therefore add individual developer overrrides to <home-dir>/bedework.build.properties 
    145# 
    156 
    …… 
    4031org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml 
    4132 
    42 # Enable/disable replacement of log4j config during deployment 
    43 org.bedework.deploy.log4j.config=no 
    44  

  • trunk/config/bwbuild/jboss-mysql/cal.properties

    r3096 r3098  
    127127appserver.lib.dir=${org.bedework.jboss.config.dir}/lib 
    128128 
    129 # where things like log4j config files go 
     129# where data files go 
    130130org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 
    131131org.bedework.data.dir=${org.bedework.jboss.data.dir} 
    …… 
    139139org.bedework.server.resource.root.dir=server/${org.bedework.jboss.config}/deploy/ROOT.war 
    140140 
    141 # where things like log4j config files go 
    142 log4j.config.destination=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf 
    143  
    144 #  Set to yes if you want your log4j.xml overwritten 
    145 org.bedework.deploy.log4j.config=no 
     141# The log4j config file destination 
     142org.bedework.log4j.config=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf/jboss-log4j.xml 
    146143# 
    147144# If set to true or yes will copy in the bedework db datasource def bedework-ds.xml 

  • trunk/config/bwbuild/jboss-postgresql/build.properties

    r3059 r3098  
    33# 
    44# Configure a build of a demo calendar running on bedework.org. 
    5 # 
    6 # This file gives users the opportunity to override properties that will be 
    7 # defined later in the build process. 
    8 # The order of loading is: 
    9 #   <home-dir>/bedework.build.properties  (this file) 
    10 #   local.build.properties 
    11 #   <various other distributed properties> 
    12 # 
    13 # Therefore add individual developer overrrides to <home-dir>/bedework.build.properties 
    145# 
    156 
    …… 
    4233#org.bedework.exsynch.options=${env.BEDEWORK_CONFIG}/exsynch.options.xml 
    4334 
    44 # Enable/disable replacement of log4j config during deployment 
    45 org.bedework.deploy.log4j.config=no 
    46  

  • trunk/config/bwbuild/jboss-postgresql/cal.properties

    r3096 r3098  
    141141org.bedework.server.resource.root.dir=server/${org.bedework.jboss.config}/deploy/ROOT.war 
    142142 
    143 # where things like log4j config files go 
    144 log4j.config.destination=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf 
    145  
    146 #  Set to yes if you want your log4j.xml overwritten 
    147 org.bedework.deploy.log4j.config=no 
     143# The log4j config file destination 
     144org.bedework.log4j.config=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf/jboss-log4j.xml 
    148145# 
    149146# If set to true or yes will copy in the bedework db datasource def bedework-ds.xml