Changeset 3408

Show
Ignore:
Timestamp:
11/30/11 13:54:21
Author:
douglm
Message:

(Partial updates as full update failed with some conflict)

Major refactoring of code to move all jar building into separate projects outside of the main bedework project which itself becomes an assembly project - that is it builds deployable components from the jars and other information.

This change is to facilitate the move to jboss 7.

Further changes are needed but probably no more major reorganization.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • releases/bedework-3.8/config/bwbuild/.defaults/cal.properties

    r3395 r3408  
    304304# Admin Web Client 
    305305# 
    306 org.bedework.app.CalAdmin.project=webapps 
     306org.bedework.app.CalAdmin.project=bwwebapps 
    307307org.bedework.app.CalAdmin.sou.dir=webadmin 
    308308org.bedework.app.CalAdmin.default.contenttype=text/xml 
     
    331331# Events submission Web Client 
    332332# 
    333 org.bedework.app.EventSubmit.project=webapps 
     333org.bedework.app.EventSubmit.project=bwwebapps 
    334334org.bedework.app.EventSubmit.sou.dir=websubmit 
    335335org.bedework.app.EventSubmit.default.contenttype=text/xml 
     
    358358# Public Web Client 
    359359# 
    360 org.bedework.app.Events.project=webapps 
     360org.bedework.app.Events.project=bwwebapps 
    361361org.bedework.app.Events.sou.dir=webclient 
    362362org.bedework.app.Events.default.contenttype=text/xml 
     
    382382# Feed Server 
    383383# 
    384 org.bedework.app.Feeder.project=webapps 
     384org.bedework.app.Feeder.project=bwwebapps 
    385385org.bedework.app.Feeder.sou.dir=feeder 
    386386org.bedework.app.Feeder.default.contenttype=text/xml 
     
    407407# Demo departmental public Web Client 
    408408# 
    409 org.bedework.app.SoEDept.project=webapps 
     409org.bedework.app.SoEDept.project=bwwebapps 
    410410org.bedework.app.SoEDept.sou.dir=webclient 
    411411org.bedework.app.SoEDept.default.contenttype=text/xml 
     
    431431# Personal Web Client 
    432432# 
    433 org.bedework.app.UserCal.project=webapps 
     433org.bedework.app.UserCal.project=bwwebapps 
    434434org.bedework.app.UserCal.sou.dir=webclient 
    435435org.bedework.app.UserCal.default.contenttype=text/xml 
     
    458458# Public Caldav Server 
    459459# 
    460 org.bedework.app.Pubcaldav.project=caldavimpl 
     460org.bedework.app.Pubcaldav.project=bwcaldav 
    461461org.bedework.app.Pubcaldav.sou.dir=server 
    462462org.bedework.app.Pubcaldav.interface.jar=bw-caldav 
     
    480480# Personal Caldav Server 
    481481# 
    482 org.bedework.app.Usercaldav.project=caldavimpl 
     482org.bedework.app.Usercaldav.project=bwcaldav 
    483483org.bedework.app.Usercaldav.sou.dir=server 
    484484org.bedework.app.Usercaldav.interface.jar=bw-caldav 
     
    506506# Public Calws Server 
    507507# 
    508 org.bedework.app.Pubcalws.project=caldavimpl 
     508org.bedework.app.Pubcalws.project=bwcaldav 
    509509org.bedework.app.Pubcalws.sou.dir=server 
    510510org.bedework.app.Pubcalws.interface.jar=bw-caldav 
     
    528528# Personal Calws Server 
    529529# 
    530 org.bedework.app.Usercalws.project=caldavimpl 
     530org.bedework.app.Usercalws.project=bwcaldav 
    531531org.bedework.app.Usercalws.sou.dir=server 
    532532org.bedework.app.Usercalws.interface.jar=bw-caldav 
     
    628628# 
    629629 
    630 org.bedework.app.sysevlog.project=calendarapi 
     630org.bedework.app.sysevlog.project=bwsysevents 
    631631org.bedework.app.sysevlog.sou.dir= 
    632632org.bedework.app.sysevlog.shellscr.name=bwrun 
     
    641641# 
    642642 
    643 org.bedework.app.monitor.project=calendarapi 
     643org.bedework.app.monitor.project=bwsysevents 
    644644org.bedework.app.monitor.sou.dir= 
    645645org.bedework.app.monitor.shellscr.name=bwrun 
     
    654654# 
    655655 
    656 org.bedework.app.genkeys.project=calendarapi 
     656org.bedework.app.genkeys.project=bwcalFacade 
    657657org.bedework.app.genkeys.sou.dir= 
    658658org.bedework.app.genkeys.shellscr.name=bwrun 
     
    667667# 
    668668 
    669 org.bedework.app.iosched.project=calendarapi 
     669org.bedework.app.iosched.project=bwcalcore 
    670670org.bedework.app.iosched.sou.dir= 
    671671org.bedework.app.iosched.in.ear=true 
  • releases/bedework-3.8/config/bwbuild/.defaults/versions.properties

    r3342 r3408  
    44org.bedework.version=3.8 
    55org.bedework.access.version=3.8 
     6org.bedework.annotations.version=3.8 
     7org.bedework.bwcaldav.version=3.8 
    68org.bedework.bwtools.version=3.8 
    79org.bedework.bwxml.version=3.8 
     10org.bedework.calcore.version=3.8 
    811org.bedework.caldav.version=3.8 
    912org.bedework.caldavtest.version=3.8 
    10 org.bedework.calendarapi.version=3.8 
     13org.bedework.calfacade.version=3.8 
    1114org.bedework.davutil.version=3.8 
    1215org.bedework.dumprestore.version=3.8 
     16org.bedework.icalendar.version=3.8 
    1317org.bedework.indexer.version=3.8 
     18org.bedework.interfaces.version=3.8 
     19org.bedework.misc.version=3.8 
    1420org.bedework.rpiutil.version=3.8 
     21org.bedework.sysevents.version=3.8 
    1522org.bedework.testsuite.version=3.8 
    1623org.bedework.webapps.version=3.8