Changeset 1652

Show
Ignore:
Timestamp:
12/05/07 09:45:26
Author:
douglm
Message:

Rename some core components to avoid confusion

Move some code out of CalSvc? into subscriptions handler

Take a look at config application to see if we can resurrect it

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build.xml

    r1551 r1652  
    529529    <copy-to-dependent this="${org.bedework.project.calendarapi}" 
    530530                       target="${org.bedework.project.webapps}" /> 
     531    <copy-special-to-dependent this="${org.bedework.project.calendarapi}" 
     532                       target="${org.bedework.project.webapps}" 
     533                       prefix="bw-calenv" /> 
    531534    <copy-to-dependent this="${org.bedework.project.calendarapi}" 
    532535                       target="${org.bedework.project.testsuite}" /> 

  • trunk/build/buildwar.xml

    r1605 r1652  
    573573    </replace> 
    574574    <replace file="${app.dest.webinf}/jboss-web.xml"> 
    575       <replacefilter token="@VIRTUAL-HOST@" value="${org.bedework.global.virtual.host}"/> 
     575      <replacefilter token="@VIRTUAL-HOST@" value="${propval.app.virtual.host}"/> 
    576576    </replace> 
    577577  </target> 

  • trunk/config/configs/democal.properties

    r1651 r1652  
    2020 
    2121# Define the names of the applications we want to build 
    22 org.bedework.install.app.names=CalAdmin,EventSubmit,Events,SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres 
     22org.bedework.install.app.names=bwconfig,CalAdmin,EventSubmit,Events,SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres 
    2323 
    2424# 
    …… 
    141141org.bedework.hsqldb.dbname=demo/events 
    142142 
    143 #  If uPortal2 builds are enabled this is where the default dbname 
     143#  If uPortal2 builds are enabled this is the default dbname 
    144144org.bedework.hsqldb.uportal2.dbname=uportal2/uportal 
    145145 
    …… 
    160160appserver.lib.dir=${org.bedework.appserver.dir}/common/lib 
    161161 
    162 #w  here 'endorsed' library files go.  These classes override anything 
    163 # the JVM has. This is particularly important for things like Xalan, 
    164 # etc., which can break the application if you choose the wrong version 
     162# where 'endorsed' library files go.  These classes override anything 
     163# the JVM has. This is particularly important for things like Xalan, 
     164# etc., which can break the application if you choose the wrong version 
    165165appserver.endorsed.dir=${org.bedework.appserver.dir}/common/endorsed 
    166166 
    167 # where things like log4j config files go 
     167# where things like log4j config files go 
    168168log4j.config.destination=${org.bedework.appserver.dir}/common/classes 
    169169 
    170 # the toplevel directory for the default web application 
     170# the toplevel directory for the default web application 
    171171webapp.root.dir=${org.bedework.appserver.deploy.dir}/ROOT 
    172172 
    …… 
    221221org.bedework.app.CalAdmin.ear.name=caladmin 
    222222org.bedework.app.CalAdmin.context.root=/caladmin 
     223# Set for jboss 
     224#org.bedework.app.CalAdmin.virtual.host= 
    223225org.bedework.app.CalAdmin.root=http://localhost:8080/caladminrsrc 
    224226org.bedework.app.CalAdmin.resources.dir=/webapps/ROOT/caladminrsrc 
    …… 
    254256org.bedework.app.EventSubmit.ear.name=eventsubmit 
    255257org.bedework.app.EventSubmit.context.root=/eventsubmit 
     258# Set for jboss 
     259#org.bedework.app.EventSubmit.virtual.host= 
    256260org.bedework.app.EventSubmit.root=http://localhost:8080/eventsubmitrsrc 
    257261org.bedework.app.EventSubmit.resources.dir=/webapps/ROOT/eventsubmitrsrc 
    …… 
    285289org.bedework.app.Events.ear.name=cal 
    286290org.bedework.app.Events.context.root=/cal 
     291# Set for jboss 
     292#org.bedework.app.Events.virtual.host= 
    287293org.bedework.app.Events.root=http://localhost:8080/calrsrc 
    288294org.bedework.app.Events.resources.dir=/webapps/ROOT/calrsrc 
    …… 
    314320org.bedework.app.SoEDept.ear.name=soedept 
    315321org.bedework.app.SoEDept.context.root=/soedept 
     322# Set for jboss 
     323#org.bedework.app.SoEDept.virtual.host= 
    316324org.bedework.app.SoEDept.root=/calrsrc 
    317325org.bedework.app.SoEDept.resources.dir=/webapps/ROOT/calrsrc 
    …… 
    343351org.bedework.app.UserCal.ear.name=ucal 
    344352org.bedework.app.UserCal.context.root=/ucal 
     353# Set for jboss 
     354#org.bedework.app.UserCal.virtual.host= 
    345355org.bedework.app.UserCal.root=/ucalrsrc 
    346356org.bedework.app.UserCal.resources.dir=/webapps/ROOT/ucalrsrc 
    …… 
    373383org.bedework.app.Pubcaldav.ear.name=pubcaldav 
    374384org.bedework.app.Pubcaldav.context.root=/pubcaldav 
     385# Set for jboss 
     386#org.bedework.app.Pubcaldav.virtual.host= 
    375387 
    376388org.bedework.app.Pubcaldav.description=Bedework public caldav server. 
    …… 
    399411org.bedework.app.Usercaldav.ear.name=ucaldav 
    400412org.bedework.app.Usercaldav.context.root=/ucaldav 
     413# Set for jboss 
     414#org.bedework.app.Usercaldav.virtual.host= 
    401415 
    402416org.bedework.app.Usercaldav.security.domain=demo