Changeset 2735

Show
Ignore:
Timestamp:
01/28/10 23:14:26
Author:
douglm
Message:

Further fixes to startjboss

Copy init data into the jboss data directory

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/quickstart/linux/startjboss

    r2734 r2735  
    2121 
    2222# standard ports 
    23 JBOSS_PORTS= 
    24  
    25 # standard ports + 100 
    26 #JBOSS_PORTS="-Djboss.service.binding.set=ports-01" 
    27  
    28 # standard ports + 200 
    29 #JBOSS_PORTS="-Djboss.service.binding.set=ports-02" 
     23JBOSS_PORTS=-Dorg.bedework.system.ports.offset=0 
    3024 
    3125# standard ports + defined value 

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

    r2730 r2735  
    118118appserver.lib.dir=${org.bedework.jboss.config.dir}/lib 
    119119 
     120# where things like log4j config files go 
     121org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 
     122 
    120123# where 'endorsed' library files go.  These classes override anything 
    121124# the JVM has. This is particularly important for things like Xalan, 
    122125# etc., which can break the application if you choose the wrong version 
    123 appserver.endorsed.dir=${org.bedework.appserver.dir}/common/endorsed 
    124  
    125 # where things like log4j config files go 
    126 log4j.config.destination=${org.bedework.appserver.dir}/common/classes 
     126appserver.endorsed.dir=${org.bedework.appserver.dir}/lib/endorsed 
    127127 
    128128# the toplevel directory for the server static resources, relative to the application server home 
    129129org.bedework.server.resource.root.dir=server/${org.bedework.jboss.config}/deploy/ROOT.war 
     130 
     131# where things like log4j config files go 
     132log4j.config.destination=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf 
    130133 
    131134#  Set to yes if you want your log4j.xml overwritten 

  • trunk/deployment/dumprestore/shellscr/META-INF/jboss-service.xml

    r2696 r2735  
    4040     
    4141    <!-- XML data input file name - full path. Used for data restore --> 
    42     <attribute name="DataIn">data/initbedework.xml</attribute> 
     42    <attribute name="DataIn">${jboss.server.data.dir}/bedework/dumprestore/initbedework.xml</attribute> 
    4343 
    4444    <!-- We need activemq -->     

  • trunk/deployment/dumprestore/shellscr/build.xml

    r2714 r2735  
    3535       The "deploy" target first builds a configured component then copies 
    3636       all required files to the appropriate servlet container directories. 
    37  
    38        Currently this only works for the quickstart distribution. 
    39        For example, it does not handle deploying into jboss and copying 
    40        resource files (images, stylesheets) to external locations. 
    4137       ================================================================= --> 
    4238 
    …… 
    5046    <mkdir dir="${app.temp.home}"/> 
    5147 
    52     <mkdir dir="${app.temp.home}/data"/> 
    53     <copy todir="${app.temp.home}/data"  
    54             file="${app.sou.dir}/resources/initbedework.xml" /> 
    55     <copy todir="${app.temp.home}/data"  
    56             file="${app.sou.dir}/resources/initbedework-sparse.xml" /> 
     48        <if> 
     49                <equals arg1="jboss" arg2="${org.bedework.global.deploy.platform}"/> 
     50                <then> 
     51        <mkdir dir="${org.bedework.jboss.data.dir}/dumprestore"/> 
     52        <copy todir="${org.bedework.jboss.data.dir}/dumprestore"  
     53              file="${app.sou.dir}/resources/initbedework.xml" /> 
     54        <copy todir="${org.bedework.jboss.data.dir}/dumprestore"  
     55              file="${app.sou.dir}/resources/initbedework-sparse.xml" /> 
     56          </then> 
     57                <else> 
     58        <mkdir dir="${app.temp.home}/data"/> 
     59        <copy todir="${app.temp.home}/data"  
     60                    file="${app.sou.dir}/resources/initbedework.xml" /> 
     61        <copy todir="${app.temp.home}/data"  
     62                    file="${app.sou.dir}/resources/initbedework-sparse.xml" /> 
     63                </else> 
     64    </if> 
    5765 
    5866    <fileset id="org.bedework.shellscr.data" dir="${app.temp.home}/data" />