Changeset 3191

Show
Ignore:
Timestamp:
02/22/11 13:27:46
Author:
douglm
Message:

Changes to introduce bwxml project - all xml schemas now located in this project built separately.

Other projects with a dependency now build this project.

Also fixed a few java warnings that surfaced from the noise.

Added an updateall action to bw

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildTools/wsimport.xml

    r3152 r3191  
    2424  <macrodef name="wsimport"> 
    2525    <attribute name="wsdl"/> 
     26    <attribute name="wsdllocation" />  
    2627    <attribute name="module-base"/> 
    2728    <attribute name="jar-file"/> 
    …… 
    3031      <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
    3132       
    32       <property name="sourcedestdir" location="@{module-base}/src" /> 
    33  
     33      <var name="sourcedestdir" value="@{module-base}/src" /> 
    3434       
    3535      <dirname property="org.bedework.wsdl.dir" file="@{wsdl}"/> 
    3636 
    3737      <if> 
    38         <available file="${sourcedestdir}" type="dir" /> 
    39         <then> 
     38        <and> 
     39          <available file="${sourcedestdir}" type="dir" /> 
    4040          <uptodate property="org.bedework.wsimport.uptodate" 
    4141                    targetfile="@{jar-file}" > 
    4242            <srcfiles dir="${org.bedework.wsdl.dir}" /> 
    4343          </uptodate> 
    44         </then> 
    45       </if> 
    46  
    47       <if> 
    48         <isset property="org.bedework.wsimport.uptodate"/> 
     44        </and> 
    4945        <then> 
    5046          <noisyMsg message="**** @{jar.file} is up to date" /> 
    …… 
    116112          <debugCpid idpar="wsimport.classpath" /> 
    117113       
    118           <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport"> 
     114          <taskdef name="wsimportTask" classname="com.sun.tools.ws.ant.WsImport"> 
    119115            <classpath refid="wsimport.classpath" /> 
    120116          </taskdef> 
    …… 
    129125            <equals arg1="@{bindingsdir}" arg2="" /> 
    130126            <then> 
    131               <wsimport keep="true" 
    132                         sourcedestdir="${sourcedestdir}" 
    133                         destdir="${wsimport.dest}" 
    134                         wsdl="@{wsdl}"  
    135                         xendorsed="true" > 
    136               </wsimport> 
     127              <wsimportTask keep="true" 
     128                            sourcedestdir="${sourcedestdir}" 
     129                            destdir="${wsimport.dest}" 
     130                            wsdl="@{wsdl}"  
     131                            wsdllocation="@{wsdllocation}" 
     132                            xendorsed="true" > 
     133              </wsimportTask> 
    137134            </then> 
    138135            <else> 
    139               <wsimport keep="true" 
    140                         sourcedestdir="${sourcedestdir}" 
    141                         destdir="${wsimport.dest}" 
    142                         wsdl="@{wsdl}"  
    143                         xendorsed="true" > 
     136              <wsimportTask keep="true" 
     137                            sourcedestdir="${sourcedestdir}" 
     138                            destdir="${wsimport.dest}" 
     139                            wsdl="@{wsdl}"  
     140                            wsdllocation="@{wsdllocation}" 
     141                            xendorsed="true" > 
    144142                <binding dir="@{bindingsdir}" includes="*.xml"> 
    145143                </binding> 
    146               </wsimport> 
     144              </wsimportTask> 
    147145            </else> 
    148146          </if> 

  • trunk/build/quickstart/linux/bw

    r3180 r3191  
    2020bw_loglevel="" 
    2121 
     22# Projects we need to update 
     23updateProjects="bwxml bedework bedework-carddav bwtzsvr cachedfeeder" 
     24 
    2225echo "" 
    2326echo "  Bedework Calendar System" 
    …… 
    2831 
    2932usage() { 
     33  echo "  $PRG ACTION" 
    3034  echo "  $PRG [CONFIG-SOURCE] [CONFIG] [PROJECT] [ -offline ] [LOG_LEVEL] [ target ] " 
    31   echo "  $PRG ACTION" 
    3235  echo "" 
    3336  echo " where:" 
     37  echo "" 
     38  echo "   ACTION defines an action to take usually in the context of the quickstart." 
     39  echo "    In a deployed system many of these actions are handled directly by a" 
     40  echo "    deployed application. ACTION may be one of" 
     41  echo "      -updateall  Does an svn update of all projects" 
     42  echo "      -reindex    runs the indexer directly out of the quickstart bedework" 
     43  echo "                  dist directory to rebuild the lucene indexes" 
     44  echo "      -zoneinfo   builds zoneinfo data for the timezones server" 
     45  echo "                  requires -version and -tzdata parameters.   NOTE: build depends on glib2" 
     46  echo "      -buildwebcache     builds webcache" 
     47  echo "      -deploywebcache    deploys webcache" 
     48  echo "      -deployurlbuilder  deploys url/widget builder" 
    3449  echo "" 
    3550  echo "   CONFIG-SOURCE optionally defines the location of configurations and" 
    …… 
    5570  echo "" 
    5671  echo "   PROJECT optionally defines the package to build and is none or more of" 
     72  echo "     -bwxml       Target is for the Bedework XML schemas build" 
    5773  echo "     -carddav     Target is for the CardDAV build" 
    5874  echo "     -exsynch     Target is for the Exchange synch build" 
    …… 
    7591  echo "   configuration directory and can be used to build a path to the other files." 
    7692  echo "" 
    77   echo "   ACTION defines an action to take usually in the context of the quickstart." 
    78   echo "    In a deployed system many of these actions are handled directly by a" 
    79   echo "    deployed application. ACTION may be one of" 
    80   echo "      -reindex    runs the indexer directly out of the quickstart bedework" 
    81   echo "                  dist directory to rebuild the lucene indexes" 
    82   echo "      -zoneinfo   builds zoneinfo data for the timezones server" 
    83   echo "                  requires -version and -tzdata parameters.   NOTE: build depends on glib2" 
    84   echo "      -buildwebcache     builds webcache" 
    85   echo "      -deploywebcache    deploys webcache" 
    86   echo "      -deployurlbuilder  deploys url/widget builder" 
    87   echo "" 
    8893} 
    8994 
    …… 
    98103  usage 
    99104  exit 1 
     105} 
     106 
     107# ----------------------------------------------------------------------------  
     108# Update the projects 
     109# ----------------------------------------------------------------------------  
     110actionUpdateall() { 
     111  for project in $updateProjects 
     112  do 
     113    echo "*********************************************************************" 
     114    echo "Updating project $project" 
     115    echo "*********************************************************************" 
     116    svn update $project 
     117  done 
     118   
     119  exit 0 
    100120} 
    101121 
    …… 
    243263pkgdefault=yes 
    244264bedework= 
    245 bwxmlschema= 
     265bwxml= 
    246266carddav= 
    247267caldav= 
    …… 
    262282# look for actions first 
    263283 
     284if [ "$1" = "-updateall" ] ; then 
     285  actionUpdateall 
     286fi 
     287 
    264288if [ "$1" = "-reindex" ] ; then 
    265289  actionReindex 
    …… 
    349373# ------------------------Projects 
    350374    -bwxml) 
    351       bwxmlschema="yes" 
     375      bwxml="yes" 
    352376      pkgdefault= 
    353377      shift 
    …… 
    434458echo "BWCONFIG=$BWCONFIG" 
    435459 
    436 if [ "$bwxmlschema" != "" ] ; then 
    437   cd $QUICKSTART_HOME/bwxml-schema 
     460if [ "$bwxml" != "" ] ; then 
     461  cd $QUICKSTART_HOME/bwxml 
    438462fi 
    439463 

  • trunk/build/quickstart/windows/bw.bat

    r3180 r3191  
    158158  GOTO branch 
    159159 
     160:updateall 
     161  for %%project in (%updateProjects%) do ( 
     162    ECHO ************************************************************* 
     163    ECHO Updating project %%project. 
     164    ECHO ************************************************************* 
     165     
     166    echo svn update %%project 
     167  ) 
     168 
     169  GOTO:EOF 
     170   
    160171:reindex 
    161172  ECHO     Calling the reindexer 
    …… 
    268279IF "%1" == "-bwc" GOTO bwc 
    269280IF "%1" == "-offline" GOTO offline 
     281IF "%1" == "-updateall" GOTO updateall 
    270282IF "%1" == "-reindex" GOTO reindex 
    271283IF "%1" == "-zoneinfo" GOTO zoneinfo 
    …… 
    293305  ECHO    Usage: 
    294306  ECHO. 
     307  ECHO    bw ACTION 
    295308  ECHO    bw [CONFIG-SOURCE] [CONFIG] [PROJECT] [ -offline ] [ target ] 
    296   ECHO    bw ACTION 
    297309  ECHO. 
    298310  ECHO    Where: 
     311  ECHO. 
     312  ECHO   ACTION defines an action to take usually in the context of the quickstart. 
     313  ECHO    In a deployed system many of these actions are handled directly by a 
     314  ECHO    deployed application. ACTION may be one of 
     315  ECHO      -updateall  Does an svn update of all projects" 
     316  ECHO      -reindex    runs the indexer directly out of the quickstart bedework 
     317  ECHO                  dist directory to rebuild the lucene indexes 
     318REM   Don't support zoneinfo command on Windows for now 
     319REM   ECHO      -zoneinfo - builds zoneinfo data for the timezones server 
     320REM   ECHO                  requires -version and -tzdata parameters 
     321  ECHO      -buildwebcache    builds webcache 
     322  ECHO      -deploywebcache   deploys webcache  
     323  ECHO      -deployurlbuilder deploys url/widget builder 
    299324  ECHO. 
    300325  ECHO    CONFIG-SOURCE optionally defines the location of configurations and is one or none of 
    …… 
    330355  ECHO    configuration directory and can be used to build a path to the other files. 
    331356  ECHO. 
    332   ECHO   ACTION defines an action to take usually in the context of the quickstart. 
    333   ECHO    In a deployed system many of these actions are handled directly by a 
    334   ECHO    deployed application. ACTION may be one of 
    335   ECHO      -reindex - runs the indexer directly out of the quickstart bedework 
    336   ECHO                 dist directory to rebuild the lucene indexes 
    337 REM   Don't support zoneinfo command on Windows for now 
    338 REM   ECHO      -zoneinfo - builds zoneinfo data for the timezones server 
    339 REM   ECHO                  requires -version and -tzdata parameters 
    340   ECHO     -buildwebcache - builds webcache 
    341   ECHO     -deploywebcache - deploys webcache  
    342   ECHO     -deployurlbuilder - deploys url/widget builder 
    343   ECHO. 
    344   ECHO. 
    345   ECHO. 
     357  ECHO. 
     358  ECHO. 

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

    r3170 r3191  
    1111org.bedework.access.version=3.7 
    1212org.bedework.bwtools.version=3.7 
     13org.bedework.bwxml.version=3.7 
    1314org.bedework.caldav.version=3.7 
    1415org.bedework.caldavtest.version=3.7 

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

    r3180 r3191  
    669669org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server 
    670670org.bedework.app.exsynchwcb.name=Demoexsynchw 
    671 org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir} 
     671#org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir} 
     672org.bedework.app.exsynchwcb.wsdl,deploy.dir=/exchange 
    672673org.bedework.app.exsynchwcb.logprefix=exsynch 
    673674 

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

    r3170 r3191  
    1111org.bedework.access.version=3.7 
    1212org.bedework.bwtools.version=3.7 
     13org.bedework.bwxml.version=3.7 
    1314org.bedework.caldav.version=3.7 
    1415org.bedework.caldavtest.version=3.7 

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

    r3180 r3191  
    662662org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server 
    663663org.bedework.app.exsynchwcb.name=Demoexsynchw 
    664 org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir} 
     664#org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir} 
     665org.bedework.app.exsynchwcb.wsdl,deploy.dir=/exchange 
    665666org.bedework.app.exsynchwcb.logprefix=exsynch 
    666667 

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

    r3170 r3191  
    1111org.bedework.access.version=3.7 
    1212org.bedework.bwtools.version=3.7 
     13org.bedework.bwxml.version=3.7 
    1314org.bedework.caldav.version=3.7 
    1415org.bedework.caldavtest.version=3.7 

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

    r3180 r3191  
    667667org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server 
    668668org.bedework.app.exsynchwcb.name=Demoexsynchw 
    669 org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir} 
     669#org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir} 
     670org.bedework.app.exsynchwcb.wsdl,deploy.dir=/exchange 
    670671org.bedework.app.exsynchwcb.logprefix=exsynch 
    671672 

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

    r3170 r3191  
    1111org.bedework.access.version=3.7 
    1212org.bedework.bwtools.version=3.7 
     13org.bedework.bwxml.version=3.7 
    1314org.bedework.caldav.version=3.7 
    1415org.bedework.caldavtest.version=3.7 

  • trunk/config/bwbuild/jboss-postgresql/cal.options.xml

    r3187 r3191  
    898898          <appType>exsynch</appType> 
    899899 
    900           <!-- location of the WSDL - modified to include server element --> 
     900          <!-- location of the WSDL - modified to include server element  
     901               localhost may be good enough  
     902          --> 
    901903          <exchangeWSDLURI>http://localhost:8080/exchange/Services.wsdl</exchangeWSDLURI> 
     904 
     905          <!-- location of the WSDL for the remote web service --> 
     906          <remoteWSDLURI>http://localhost:8080/exchange/wssvc.wsdl</remoteWSDLURI> 
    902907 
    903908          <!-- Exchange sync callback. Comment out for no service --> 
    …… 
    906911          <!-- Path to keystore - comment out to use default -->           
    907912          <keystore>@APPSERVER-DATA-DIR@/exsynchcerts</keystore> 
    908  
    909           <!-- location of the WSDL for the remote web service --> 
    910           <remoteWSDLURI>http://localhost:8080/exchange/wssvc.wsdl</remoteWSDLURI> 
    911913           
    912914          <remoteWsURL>http://localhost:8080/pubcaldav/exsynchws/</remoteWsURL> 

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

    r3180 r3191  
    668668org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server 
    669669org.bedework.app.exsynchwcb.name=Demoexsynchw 
    670 org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir} 
     670#org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir} 
     671org.bedework.app.exsynchwcb.wsdl,deploy.dir=/exchange 
    671672org.bedework.app.exsynchwcb.logprefix=exsynch 
    672673 

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

    r2588 r3191  
    22# bedework.org/build.properties 
    33# 
    4 # Configure a build of a demo calendar running on bedework.org under liferay 5 
    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  if it exists 
    10 #   <various other distributed properties> 
     4# Configure a build of a demo calendar running on bedework.org. 
    115# 
    126 
    137compile.debug=yes 
     8 
     9# Version we are building and including 
     10org.bedework.version=3.7 
     11org.bedework.access.version=3.7 
     12org.bedework.bwtools.version=3.7 
     13org.bedework.bwxml.version=3.7 
     14org.bedework.caldav.version=3.7 
     15org.bedework.caldavtest.version=3.7 
     16org.bedework.calendarapi.version=3.7 
     17org.bedework.davutil.version=3.7 
     18org.bedework.dumprestore.version=3.7 
     19org.bedework.indexer.version=3.7 
     20org.bedework.rpiutil.version=3.7 
     21org.bedework.testsuite.version=3.7 
     22org.bedework.webapps.version=3.7 
     23org.bedework.webdav.version=3.7 
    1424 
    1525org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME} 
    …… 
    1929 
    2030org.bedework.config.sysevents.properties=${env.BEDEWORK_CONFIG}/sysevents.properties 
    21  
    22 org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml 
    23  
    24 # Enable/disable replacement of log4j config during deployment 
    25 org.bedework.deploy.log4j.config=no 
    26  

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

    r2711 r3191  
    44# Introduction 
    55# 
     6# All properties defined in this file are used at deploy time only. The options 
     7# xml file contains all run time properties and will be built in to the resulting 
     8# war files and runable components. 
    69# 
    710# Properties for all modules are saved below - even if they are not 
    …… 
    912# deployed as well as some other global properties. 
    1013# 
    11 # Note that the options and properties are undergoing yet another upheaval. 
    12 # They will be divided into two parts, build-time ant properties in this file 
    13 # and run-time application properties in a corresponding xxx.options.xml file. 
    14 # 
    1514# -------------------------------------------------------------------- 
    1615# 
    …… 
    1817# 
    1918# Define the names of the applications we want to build 
    20 org.bedework.install.app.names=bwconfig,CalAdmin,EventSubmit,Events,SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres 
     19org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\ 
     20 SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,\ 
     21 test,sysevlog,monitor,genkeys 
    2122 
    2223# 

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

    r3059 r3191  
    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 
    …… 
    2011org.bedework.access.version=3.7 
    2112org.bedework.bwtools.version=3.7 
     13org.bedework.bwxml.version=3.7 
    2214org.bedework.caldav.version=3.7 
    2315org.bedework.caldavtest.version=3.7 
    …… 
    3729 
    3830org.bedework.config.sysevents.properties=${env.BEDEWORK_CONFIG}/sysevents.properties 
    39  
    40 org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml 
    41  
    42 # Enable/disable replacement of log4j config during deployment 
    43 org.bedework.deploy.log4j.config=no 
    44  

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

    r2711 r3191  
    1818# Define the names of the applications we want to build 
    1919org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\ 
    20  SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres,indexer,\ 
    21  sysevlog,iosched 
     20 SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,\ 
     21 test,sysevlog,monitor,genkeys 
    2222 
    2323# 
    …… 
    3838org.bedework.global.jdbcpw= 
    3939 
     40# DB Datasource for jboss services 
     41# There doesn't appear to be the extra level of indirection that the jboss-web.xml 
     42# files allow so this will appear directly in the hibernate proeprties file for 
     43# jboss services. 
     44 
     45# Note - apparently the java Property classes preserve trailing blanks 
     46# Hibernate will include that trailing blank as part of the name leading to  
     47# much grief.  
     48org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS 
     49org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS 
     50org.bedework.global.jboss.exsynch.datasource.jndiname=/ExsynchDS 
     51 
    4052# Hibernate caching parameters 
    4153org.bedework.global.hibernate.cache.use_second_level_cache=false 
    …… 
    4456# Specify the platform we are building for. buildwar.xml will import the file 
    4557# build/platforms/<platform>War.xml 
    46 org.bedework.global.deploy.platform=tomcat5 
     58org.bedework.global.deploy.platform=jboss 
     59# 
     60# ------------------------------------------------------------------------ 
     61# Properties enabling and controlling ear file build 
     62# ------------------------------------------------------------------------ 
     63 
     64# Comment this out to disable ear build. 
     65org.bedework.global.build.ear=yes 
     66org.bedework.global.ear.name=bwcal 
     67 
     68# 
     69# The ear can be zipped or left unzipped. Zipped can be useful for copying 
     70# Jboss will not tolerate zipped ears and unzipped wars. 
     71 
     72# Comment out or set to "no"/"false" to disable zipped ear file 
     73org.bedework.global.ear.zipped=no 
     74 
     75# How would you like your wars sir? zipped or unzipped? 
     76org.bedework.global.wars.zipped=no 
     77 
    4778# 
    4879# ------------------------------------------------------------------------ 
    …… 
    6495org.bedework.jquery.dir=jquery 
    6596 
     97# ------------------------------------------------------------------------ 
     98# Extra jars 
     99# ------------------------------------------------------------------------ 
     100# 
    66101# A place to put extra jars and files, e.g. jdbc drivers. 
    67102# This can be directed at any local directory 
    68103# 
    69 # There can be three directories inside this, jdbc, shell and war. 
    70 # org.bedework.global.ext.lib=${org.bedework.config.home}/lib 
     104# There can be three directories inside this, server, shell and war. 
     105# Though only server is used (maybe) 
     106org.bedework.global.ext.lib=${org.bedework.config.home}/lib 
     107 
     108# A list of jars to copy, delimited by "," 
     109org.bedework.global.extra.jars=${org.bedework.project.bedework}/projects/rpiutil/dist/rpiutil-${org.bedework.rpiutil.version}.jar 
    71110 
    72111# ------------------------------------------------------------------------ 
    …… 
    75114 
    76115#  where the application server lives 
    77 org.bedework.appserver.dir=${org.bedework.project.bedework}/../apache-tomcat-5.5.17 
    78  
    79 #  where we deploy 
    80 org.bedework.appserver.deploy.dir=${org.bedework.appserver.dir}/webapps 
     116org.bedework.appserver.dir=${org.bedework.project.bedework}/../jboss-5.1.0.GA 
     117 
     118# name of jboss configuration we are using 
     119org.bedework.jboss.config=default 
     120 
     121# location of jboss configuration we are using 
     122org.bedework.jboss.config.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config} 
     123 
     124# where we deploy 
     125org.bedework.appserver.deploy.dir=${org.bedework.jboss.config.dir}/bwdeploy 
    81126 
    82127#  where most library files used by all applications go 
    83 appserver.lib.dir=${org.bedework.appserver.dir}/common/lib 
     128appserver.lib.dir=${org.bedework.jboss.config.dir}/lib 
     129 
     130# where things like log4j config files go 
     131org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 
     132org.bedework.data.dir=${org.bedework.jboss.data.dir} 
    84133 
    85134# where 'endorsed' library files go.  These classes override anything 
    86135# the JVM has. This is particularly important for things like Xalan, 
    87136# etc., which can break the application if you choose the wrong version 
    88 appserver.endorsed.dir=${org.bedework.appserver.dir}/common/endorsed 
    89  
    90 # where things like log4j config files go 
    91 log4j.config.destination=${org.bedework.appserver.dir}/common/classes 
     137appserver.endorsed.dir=${org.bedework.appserver.dir}/lib/endorsed 
    92138 
    93139# the toplevel directory for the server static resources, relative to the application server home 
    94 org.bedework.server.resource.root.dir=webapps/ROOT 
    95  
    96 #  Set to yes if you want your log4j.xml overwritten 
    97 org.bedework.deploy.log4j.config=no 
     140org.bedework.server.resource.root.dir=server/${org.bedework.jboss.config}/deploy/ROOT.war 
     141 
     142# The log4j config file destination 
     143org.bedework.log4j.config=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf/jboss-log4j.xml 
     144# 
     145# If set to true or yes will copy in the bedework db datasource def bedework-ds.xml 
     146org.bedework.global.copy.bedeworkds.config=yes 
     147# 
     148# If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml 
     149org.bedework.global.copy.bedeworkcardds.config=yes 
     150# 
     151# If set to true or yes will copy in the bedework exchange synch db datasource def  
     152org.bedework.global.copy.bedeworkexsynchds.config=yes 
     153 
     154# ------------------------------------------------------------------------ 
     155# ActiveMQ defs 
     156# ------------------------------------------------------------------------ 
     157 
     158org.bedework.global.activemq.dir=${org.bedework.appserver.deploy.dir}/activemq-rar-5.3.0.rar 
     159# 
     160# If set to true or yes will copy in the activemq configuration into the rar 
     161org.bedework.global.copy.activemq.config=yes 
     162 
    98163# 
    99164# ------------------------------------------------------------------------ 
    …… 
    125190# 
    126191 
     192org.bedework.app.tzsvr.war.only=yes 
    127193org.bedework.app.tzsvr.project=bwtzsvr 
    128194org.bedework.app.tzsvr.sou.dir=tzsvr 
    …… 
    130196org.bedework.app.tzsvr.context.root=/tzsvr 
    131197# Set for jboss 
    132 #org.bedework.app.tzsvr.virtual.host= 
     198#org.bedework.app.tzsvr.virtual.host=my.host1,my.host.2 
    133199 
    134200org.bedework.app.tzsvr.description=Bedework timezones server. 
    135201org.bedework.app.tzsvr.display.name=Bedework timezones server. 
    136202org.bedework.app.tzsvr.name=tzsvr 
    137 org.bedework.app.tzsvr.deploy.dir=/webapps 
     203org.bedework.app.tzsvr.deploy.dir=${org.bedework.appserver.deploy.dir} 
    138204org.bedework.app.tzsvr.logprefix=Tzsvr 
    139205 
    …… 
    158224org.bedework.app.bwconfig.war.name=bwconfig 
    159225org.bedework.app.bwconfig.context.root=/bwconfig 
    160 org.bedework.app.bwconfig.resources.dir=/webapps/ROOT/bwconfigrsrc 
    161 org.bedework.app.bwconfig.deploy.dir=/webapps 
     226org.bedework.app.bwconfig.resources.dir=${org.bedework.server.resource.root.dir}/bwconfigrsrc 
     227org.bedework.app.bwconfig.deploy.dir=${org.bedework.appserver.deploy.dir} 
    162228org.bedework.app.bwconfig.description=Bedework properties config application 
    163229org.bedework.app.bwconfig.display.name=Bedework Config 
    …… 
    175241#org.bedework.app.CalAdmin.portlet.name=CalAdmin 
    176242 
    177 org.bedework.app.CalAdmin.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml 
     243org.bedework.app.CalAdmin.tomcat.context.xml=war/META-INF/context.xml 
    178244 
    179245org.bedework.app.CalAdmin.war.name=caladmin 
    …… 
    181247# Set for jboss 
    182248#org.bedework.app.CalAdmin.virtual.host= 
    183 org.bedework.app.CalAdmin.resources.dir=/webapps/ROOT/caladminrsrc 
    184 org.bedework.app.CalAdmin.deploy.dir=/webapps 
    185  
    186 org.bedework.app.CalAdmin.security.domain=demo 
     249org.bedework.app.CalAdmin.resources.dir=${org.bedework.server.resource.root.dir}/caladminrsrc 
     250org.bedework.app.CalAdmin.deploy.dir=${org.bedework.appserver.deploy.dir} 
     251 
     252org.bedework.app.CalAdmin.security.domain=bedeworkdemo 
    187253org.bedework.app.CalAdmin.security.prefix=demo 
    188254org.bedework.app.CalAdmin.transport.guarantee=NONE 
    …… 
    201267org.bedework.app.EventSubmit.default.contenttype=text/xml 
    202268org.bedework.app.EventSubmit.web.xml=war/WEB-INF/web.xml 
    203 org.bedework.app.EventSubmit.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml 
     269org.bedework.app.EventSubmit.tomcat.context.xml=war/META-INF/context.xml 
    204270#org.bedework.app.EventSubmit.portlet.name=EventSubmit 
    205271 
    …… 
    208274# Set for jboss 
    209275#org.bedework.app.EventSubmit.virtual.host= 
    210 org.bedework.app.EventSubmit.resources.dir=/webapps/ROOT/eventsubmitrsrc 
    211 org.bedework.app.EventSubmit.deploy.dir=/webapps 
    212  
    213 org.bedework.app.EventSubmit.security.domain=demo 
     276org.bedework.app.EventSubmit.resources.dir=${org.bedework.server.resource.root.dir}/eventsubmitrsrc 
     277org.bedework.app.EventSubmit.deploy.dir=${org.bedework.appserver.deploy.dir} 
     278 
     279org.bedework.app.EventSubmit.security.domain=bedeworkdemo 
    214280org.bedework.app.EventSubmit.security.prefix=demo 
    215281org.bedework.app.EventSubmit.transport.guarantee=NONE 
    …… 
    228294org.bedework.app.Events.default.contenttype=text/xml 
    229295org.bedework.app.Events.web.xml=war/WEB-INF/publicweb.xml 
    230 org.bedework.app.Events.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml 
     296org.bedework.app.Events.tomcat.context.xml=war/META-INF/publiccontext.xml 
    231297#org.bedework.app.Events.portlet.name=PublicCal 
    232298 
    …… 
    235301# Set for jboss 
    236302#org.bedework.app.Events.virtual.host= 
    237 org.bedework.app.Events.resources.dir=/webapps/ROOT/calrsrc 
    238 org.bedework.app.Events.deploy.dir=/webapps 
     303org.bedework.app.Events.resources.dir=${org.bedework.server.resource.root.dir}/calrsrc 
     304org.bedework.app.Events.deploy.dir=${org.bedework.appserver.deploy.dir} 
    239305org.bedework.app.Events.cal.suite=MainCampus 
    240306 
    241307org.bedework.app.Events.description=Struts based XML version of the Bedework calendar client. It may have many skins, determined by the XSLT. 
    242 org.bedework.app.Events.display.name=Demo calendar - Duke/Yale Themed Suite 
     308org.bedework.app.Events.display.name=Demo calendar 
    243309org.bedework.app.Events.name=DemoCal 
    244310 
    245  
     311# 
     312# -------------------------------------------------------------------- 
    246313# 
    247314# Feed Server 
    …… 
    256323 
    257324org.bedework.app.Feeder.war.name=feeder 
    258 org.bedework.app.Feeder.context.root=/calfeed 
     325org.bedework.app.Feeder.context.root=/feeder 
    259326# Set for jboss 
    260327#org.bedework.app.Feeder.virtual.host= 
    261 org.bedework.app.Feeder.resources.dir=/webapps/ROOT/calfeedrsrc 
    262 org.bedework.app.Feeder.deploy.dir=/webapps 
     328org.bedework.app.Feeder.resources.dir=${org.bedework.server.resource.root.dir}/calfeedrsrc 
     329org.bedework.app.Feeder.deploy.dir=${org.bedework.appserver.deploy.dir} 
    263330org.bedework.app.Feeder.cal.suite=MainCampus 
    264331 
    …… 
    266333org.bedework.app.Feeder.display.name=Demo calendar 
    267334org.bedework.app.Feeder.name=feeder 
    268  
    269335 
    270336# 
    …… 
    277343org.bedework.app.SoEDept.default.contenttype=text/xml 
    278344org.bedework.app.SoEDept.web.xml=war/WEB-INF/publicweb.xml 
    279 org.bedework.app.SoEDept.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml 
     345org.bedework.app.SoEDept.tomcat.context.xml=war/META-INF/publiccontext.xml 
    280346#org.bedework.app.SoEDept.portlet.name=SoEDept 
    281347 
    …… 
    284350# Set for jboss 
    285351#org.bedework.app.SoEDept.virtual.host= 
    286 org.bedework.app.SoEDept.resources.dir=/webapps/ROOT/calrsrc 
    287 org.bedework.app.SoEDept.deploy.dir=/webapps 
     352org.bedework.app.SoEDept.resources.dir=${org.bedework.server.resource.root.dir}/calrsrc 
     353org.bedework.app.SoEDept.deploy.dir=${org.bedework.appserver.deploy.dir} 
    288354org.bedework.app.SoEDept.cal.suite=SoEDepartmental 
    289355 
    …… 
    301367org.bedework.app.UserCal.default.contenttype=text/xml 
    302368org.bedework.app.UserCal.web.xml=war/WEB-INF/userweb.xml 
    303 org.bedework.app.UserCal.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml 
     369org.bedework.app.UserCal.tomcat.context.xml=war/META-INF/usercontext.xml 
    304370#org.bedework.app.UserCal.portlet.name=UserCal 
    305371 
    …… 
    308374# Set for jboss 
    309375#org.bedework.app.UserCal.virtual.host= 
    310 org.bedework.app.UserCal.resources.dir=/webapps/ROOT/ucalrsrc 
    311 org.bedework.app.UserCal.deploy.dir=/webapps 
    312  
    313 org.bedework.app.UserCal.security.domain=demo 
     376org.bedework.app.UserCal.resources.dir=${org.bedework.server.resource.root.dir}/ucalrsrc 
     377org.bedework.app.UserCal.deploy.dir=${org.bedework.appserver.deploy.dir} 
     378 
     379org.bedework.app.UserCal.security.domain=bedeworkdemo 
    314380org.bedework.app.UserCal.security.prefix=demo 
    315381org.bedework.app.UserCal.transport.guarantee=NONE 
    …… 
    329395 
    330396org.bedework.app.Pubcaldav.web.xml=war/WEB-INF/publicweb.xml 
    331 org.bedework.app.Pubcaldav.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml 
     397org.bedework.app.Pubcaldav.tomcat.context.xml=war/META-INF/publiccontext.xml 
    332398org.bedework.app.Pubcaldav.war.name=pubcaldav 
    333399org.bedework.app.Pubcaldav.context.root=/pubcaldav 
    …… 
    338404org.bedework.app.Pubcaldav.display.name=Bedework public caldav 
    339405org.bedework.app.Pubcaldav.name=DemoPubcaldav 
    340 org.bedework.app.Pubcaldav.deploy.dir=/webapps 
     406org.bedework.app.Pubcaldav.deploy.dir=${org.bedework.appserver.deploy.dir} 
    341407org.bedework.app.Pubcaldav.logprefix=PubCalDav 
    342408 
    …… 
    351417 
    352418org.bedework.app.Usercaldav.web.xml=war/WEB-INF/userweb.xml 
    353 org.bedework.app.Usercaldav.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml 
     419org.bedework.app.Usercaldav.tomcat.context.xml=war/META-INF/usercontext.xml 
    354420org.bedework.app.Usercaldav.war.name=ucaldav 
    355421org.bedework.app.Usercaldav.context.root=/ucaldav 
    …… 
    357423#org.bedework.app.Usercaldav.virtual.host= 
    358424 
    359 org.bedework.app.Usercaldav.security.domain=demo 
     425org.bedework.app.Usercaldav.security.domain=bedeworkdemo 
    360426org.bedework.app.Usercaldav.security.prefix=demo 
    361427org.bedework.app.Usercaldav.transport.guarantee=NONE 
    …… 
    364430org.bedework.app.Usercaldav.display.name=Bedework usercaldav 
    365431org.bedework.app.Usercaldav.name=DemoUsrcaldav 
    366 org.bedework.app.Usercaldav.deploy.dir=/webapps 
     432org.bedework.app.Usercaldav.deploy.dir=${org.bedework.appserver.deploy.dir} 
    367433org.bedework.app.Usercaldav.logprefix=UserCalDav 
    368434 
    …… 
    370436# -------------------------------------------------------------------- 
    371437# 
     438# Public Calws Server 
     439# 
     440org.bedework.app.Pubcalws.project=caldav 
     441org.bedework.app.Pubcalws.sou.dir=server 
     442org.bedework.app.Pubcalws.interface.jar=bw-caldav 
     443 
     444org.bedework.app.Pubcalws.web.xml=war/WEB-INF/publicws-web.xml 
     445org.bedework.app.Pubcalws.tomcat.context.xml=war/META-INF/publiccontext.xml 
     446org.bedework.app.Pubcalws.war.name=Pubcalws 
     447org.bedework.app.Pubcalws.context.root=/Pubcalws 
     448# Set for jboss 
     449#org.bedework.app.Pubcalws.virtual.host= 
     450 
     451org.bedework.app.Pubcalws.description=Bedework public calws server. 
     452org.bedework.app.Pubcalws.display.name=Bedework public calws 
     453org.bedework.app.Pubcalws.name=DemoPubcalws 
     454org.bedework.app.Pubcalws.deploy.dir=${org.bedework.appserver.deploy.dir} 
     455org.bedework.app.Pubcalws.logprefix=Pubcalws 
     456 
     457# 
     458# -------------------------------------------------------------------- 
     459# 
     460# Personal Calws Server 
     461# 
     462org.bedework.app.Usercalws.project=caldav 
     463org.bedework.app.Usercalws.sou.dir=server 
     464org.bedework.app.Usercalws.interface.jar=bw-caldav 
     465 
     466org.bedework.app.Usercalws.web.xml=war/WEB-INF/userws-web.xml 
     467org.bedework.app.Usercalws.tomcat.context.xml=war/META-INF/usercontext.xml 
     468org.bedework.app.Usercalws.war.name=ucalws 
     469org.bedework.app.Usercalws.context.root=/ucalws 
     470# Set for jboss 
     471#org.bedework.app.Usercalws.virtual.host= 
     472 
     473org.bedework.app.Usercalws.security.domain=bedeworkdemo 
     474org.bedework.app.Usercalws.security.prefix=demo 
     475org.bedework.app.Usercalws.transport.guarantee=NONE 
     476 
     477org.bedework.app.Usercalws.description=Bedework user calws server. 
     478org.bedework.app.Usercalws.display.name=Bedework Usercalws 
     479org.bedework.app.Usercalws.name=DemoUsrcalws 
     480org.bedework.app.Usercalws.deploy.dir=${org.bedework.appserver.deploy.dir} 
     481org.bedework.app.Usercalws.logprefix=Usercalws 
     482 
     483# 
     484# -------------------------------------------------------------------- 
     485# 
    372486# CalDAV test 
    373487# 
    374488 
     489org.bedework.app.caldavTest.runnable=yes 
    375490org.bedework.app.caldavTest.project=caldavTest 
    376491org.bedework.app.caldavTest.sou.dir=caldavTest 
    …… 
    386501# 
    387502 
     503org.bedework.app.test.runnable=yes 
    388504org.bedework.app.test.project=testsuite 
    389505org.bedework.app.test.sou.dir= 
    …… 
    413529# -------------------------------------------------------------------- 
    414530# 
    415 # Crawler 
     531# Indexer 
    416532# 
    417533 
    …… 
    439555# -------------------------------------------------------------------- 
    440556# 
     557# Server monitor 
     558# 
     559 
     560org.bedework.app.monitor.project=calendarapi 
     561org.bedework.app.monitor.sou.dir= 
     562org.bedework.app.monitor.shellscr.name=bwrun 
     563org.bedework.app.monitor.batscr.name=bwrun.bat 
     564org.bedework.app.monitor.zip.name=monitor 
     565org.bedework.app.monitor.description=Bedework system events monitor application 
     566 
     567# 
     568# -------------------------------------------------------------------- 
     569# 
     570# Key generator 
     571# 
     572 
     573org.bedework.app.genkeys.project=calendarapi 
     574org.bedework.app.genkeys.sou.dir= 
     575org.bedework.app.genkeys.shellscr.name=bwrun 
     576org.bedework.app.genkeys.batscr.name=bwrun.bat 
     577org.bedework.app.genkeys.zip.name=genkeys 
     578org.bedework.app.genkeys.description=Bedework system Key generator 
     579 
     580# 
     581# -------------------------------------------------------------------- 
     582# 
    441583# In/outbox scheduler 
    442584# 
    …… 
    444586org.bedework.app.iosched.project=calendarapi 
    445587org.bedework.app.iosched.sou.dir= 
     588org.bedework.app.iosched.in.ear=true 
    446589org.bedework.app.iosched.shellscr.name=bwrun 
    447590org.bedework.app.iosched.batscr.name=bwrun.bat 
    …… 
    449592org.bedework.app.iosched.description=Bedework In/outbox scheduler application 
    450593 
     594# 
     595# -------------------------------------------------------------------- 
     596# 
     597# Public Carddav Server 
     598# 
     599org.bedework.app.pubcarddav.project=carddav 
     600org.bedework.app.pubcarddav.sou.dir=server 
     601 
     602org.bedework.app.pubcarddav.web.xml=war/WEB-INF/publicweb.xml 
     603org.bedework.app.pubcarddav.war.name=pubcarddav 
     604org.bedework.app.pubcarddav.context.root=/pubcarddav 
     605# Set for jboss 
     606#org.bedework.app.pubcarddav.virtual.host=calendars.rpi.edu 
     607 
     608org.bedework.app.pubcarddav.description=Bedework public carddav server. 
     609org.bedework.app.pubcarddav.display.name=Bedework public carddav 
     610org.bedework.app.pubcarddav.name=Demopubcarddav 
     611org.bedework.app.pubcarddav.deploy.dir=${org.bedework.appserver.deploy.dir} 
     612org.bedework.app.pubcarddav.logprefix=pubcarddav 
     613 
     614# 
     615# -------------------------------------------------------------------- 
     616# 
     617# Personal Carddav Server 
     618# 
     619org.bedework.app.usercarddav.project=carddav 
     620org.bedework.app.usercarddav.sou.dir=server 
     621 
     622org.bedework.app.usercarddav.web.xml=war/WEB-INF/userweb.xml 
     623org.bedework.app.usercarddav.war.name=ucarddav 
     624org.bedework.app.usercarddav.context.root=/ucarddav 
     625# Set for jboss 
     626#org.bedework.app.usercarddav.virtual.host=events.rpi.edu 
     627 
     628org.bedework.app.usercarddav.security.domain=bedeworkdemo 
     629org.bedework.app.usercarddav.security.prefix=demo 
     630org.bedework.app.usercarddav.transport.guarantee=NONE 
     631 
     632org.bedework.app.usercarddav.description=Bedework user carddav server. 
     633org.bedework.app.usercarddav.display.name=Bedework usercarddav 
     634org.bedework.app.usercarddav.name=DemoUsrcarddav 
     635org.bedework.app.usercarddav.deploy.dir=${org.bedework.appserver.deploy.dir} 
     636org.bedework.app.usercarddav.logprefix=usercarddav 
     637 
     638# 
     639# -------------------------------------------------------------------- 
     640# 
     641# CardDAV importer 
     642# 
     643 
     644org.bedework.app.carddavimp.runnable=yes 
     645org.bedework.app.carddavimp.project=carddav 
     646org.bedework.app.carddavimp.sou.dir=tools 
     647org.bedework.app.carddavimp.shellscr.name=bwrun 
     648org.bedework.app.carddavimp.batscr.name=bwrun.bat 
     649org.bedework.app.carddavimp.zip.name=carddavimp 
     650org.bedework.app.carddavimp.description=Bedework CardDAV importer 
     651 
     652# 
     653# -------------------------------------------------------------------- 
     654# 
     655# Exchange synchronization Service - callback web server 
     656# 
     657org.bedework.app.exsynchwcb.project=exsynch 
     658org.bedework.app.exsynchwcb.sou.dir=server 
     659 
     660org.bedework.app.exsynchwcb.web.xml=war/WEB-INF/web.xml 
     661org.bedework.app.exsynchwcb.war.name=exsynch 
     662org.bedework.app.exsynchwcb.context.root=/exsynch 
     663# Set for jboss 
     664#org.bedework.app.usercarddav.virtual.host=events.rpi.edu 
     665 
     666org.bedework.app.exsynchwcb.description=Bedework exsynch callback server. 
     667org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server 
     668org.bedework.app.exsynchwcb.name=Demoexsynchw 
     669#org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir} 
     670org.bedework.app.exsynchwcb.wsdl,deploy.dir=/exchange 
     671org.bedework.app.exsynchwcb.logprefix=exsynch 
     672 
     673 

  • trunk/deployment/bw-core-appjars.xml

    r3180 r3191  
    2626              name="bw-cdvserver" version="${org.bedework.caldav.version}" 
    2727              projecthome="${bw.project.home}/projects/caldav" /> 
    28        
    29       <getJar lib="${org.bedework.temp.extrajars.dir}" 
    30               libcache="${org.bedework.libcache.dir}" 
    31               name="bw-exsynch-genwssrc" version="${org.bedework.caldav.version}" 
    32               projecthome="${bw.project.home}/projects/caldav" /> 
     28 
     29      <!-- ===================== Bedework schema jars ====================== --> 
     30       
     31      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     32              libcache="${org.bedework.libcache.dir}" 
     33              name="bw-exsynchwsschema" version="${org.bedework.bwxml.version}" 
     34              projecthome="${bw.project.home}/../bwxml" /> 
    3335 
    3436      <!-- ================= Bedework dump/restore jars ==================== --> 

  • trunk/util/svncopy.sh

    r3069 r3191  
    8787#      Not linked 
    8888    echo "" 
     89  elif [ "${1}" = "bwxml" ] 
     90  then 
     91#      Not linked 
     92    echo "" 
    8993  elif [ "${1}" = "cachedfeeder" ] 
    9094  then 
    …… 
    141145PROJECTS="$PROJECTS bwtools" 
    142146PROJECTS="$PROJECTS bwtzsvr" 
     147PROJECTS="$PROJECTS bwxml" 
    143148PROJECTS="$PROJECTS cachedfeeder" 
    144149PROJECTS="$PROJECTS caldav"