Changeset 3001
- Timestamp:
- 09/04/10 22:34:59
- Files:
-
- trunk/build/buildfilters.xml (modified) (1 diff)
- trunk/config/bwbuild/jboss-h2/cal.options.xml (modified) (2 diffs)
- trunk/config/bwbuild/jboss-h2/cal.properties (modified) (5 diffs)
- trunk/config/bwbuild/jboss-mysql/cal.options.xml (modified) (2 diffs)
- trunk/config/bwbuild/jboss-mysql/cal.properties (modified) (4 diffs)
- trunk/config/bwbuild/jboss-postgresql/cal.options.xml (modified) (2 diffs)
- trunk/config/bwbuild/jboss-postgresql/cal.properties (modified) (3 diffs)
- trunk/config/bwbuild/jboss/cal.options.xml (modified) (2 diffs)
- trunk/config/bwbuild/jboss/cal.properties (modified) (3 diffs)
- trunk/deployment/genkeys (added)
- trunk/deployment/genkeys/shellscr (added)
- trunk/deployment/genkeys/shellscr/META-INF (added)
- trunk/deployment/genkeys/shellscr/META-INF/jboss-service.xml (added)
- trunk/deployment/genkeys/shellscr/META-INF/jboss-structure.xml (added)
- trunk/deployment/genkeys/shellscr/appjars.xml (added)
- trunk/deployment/genkeys/shellscr/build.xml (added)
- trunk/deployment/genkeys/shellscr/resources (added)
- trunk/deployment/genkeys/shellscr/resources/log4j.xml (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/buildfilters.xml
r2695 r3001 11 11 <filter token="QUICKSTART_DIR" 12 12 value="${quickstart.dir}"/> 13 14 <filter token="DATA_DIR" 15 value="${org.bedework.data.dir}"/> 13 16 14 17 <filter token="BW-APP-NAME" trunk/config/bwbuild/jboss-h2/cal.options.xml
r2832 r3001 101 101 102 102 <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig"> 103 <privKeys>@ QUICKSTART_DIR@/data/bedework/privkeys</privKeys>104 <pubKeys>@ QUICKSTART_DIR@/data/bedework/pubkeys</pubKeys>103 <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys> 104 <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys> 105 105 106 106 <debug>true</debug> … … 521 521 522 522 <!-- ================================================================== 523 System key generator 524 ================================================================== --> 525 <genkeys classname="org.bedework.calfacade.configs.BwCrawlerConfig"> 526 <debug>true</debug> 527 <appType>genkeys</appType> 528 <guestMode>true</guestMode> 529 <debugEntity>false</debugEntity> 530 </genkeys> 531 532 <!-- ================================================================== 523 533 In/outbox scheduler program 524 534 ================================================================== --> trunk/config/bwbuild/jboss-h2/cal.properties
r2832 r3001 19 19 org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\ 20 20 SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,indexer,dumpres,\ 21 sysevlog,iosched,monitor 21 sysevlog,iosched,monitor,genkeys 22 22 23 23 # … … 42 42 # much grief. 43 43 org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS 44 org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS 44 45 45 46 # Hibernate caching parameters … … 123 124 # where things like log4j config files go 124 125 org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 126 org.bedework.data.dir=${org.bedework.jboss.data.dir} 125 127 126 128 # where 'endorsed' library files go. These classes override anything … … 154 156 # If set to true or yes will copy in the bedework db datasource def bedework-ds.xml 155 157 org.bedework.global.copy.bedeworkds.config=yes 158 # 159 # If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml 160 org.bedework.global.copy.bedeworkcardds.config=yes 156 161 157 162 # ------------------------------------------------------------------------ … … 523 528 # -------------------------------------------------------------------- 524 529 # 530 # Key generator 531 # 532 533 org.bedework.app.genkeys.project=calendarapi 534 org.bedework.app.genkeys.sou.dir= 535 org.bedework.app.genkeys.shellscr.name=bwrun 536 org.bedework.app.genkeys.batscr.name=bwrun.bat 537 org.bedework.app.genkeys.zip.name=genkeys 538 org.bedework.app.genkeys.description=Bedework system Key generator 539 540 # 541 # -------------------------------------------------------------------- 542 # 525 543 # In/outbox scheduler 526 544 # trunk/config/bwbuild/jboss-mysql/cal.options.xml
r2798 r3001 101 101 102 102 <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig"> 103 <privKeys>@ QUICKSTART_DIR@/data/bedework/privkeys</privKeys>104 <pubKeys>@ QUICKSTART_DIR@/data/bedework/pubkeys</pubKeys>103 <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys> 104 <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys> 105 105 106 106 <debug>true</debug> … … 521 521 522 522 <!-- ================================================================== 523 System key generator 524 ================================================================== --> 525 <genkeys classname="org.bedework.calfacade.configs.BwCrawlerConfig"> 526 <debug>true</debug> 527 <appType>genkeys</appType> 528 <guestMode>true</guestMode> 529 <debugEntity>false</debugEntity> 530 </genkeys> 531 532 <!-- ================================================================== 523 533 In/outbox scheduler program 524 534 ================================================================== --> trunk/config/bwbuild/jboss-mysql/cal.properties
r2836 r3001 19 19 org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\ 20 20 SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,indexer,dumpres,\ 21 sysevlog,iosched,monitor 21 sysevlog,iosched,monitor,genkeys 22 22 23 23 # … … 47 47 # much grief. 48 48 org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS 49 org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS 49 50 50 51 # Hibernate caching parameters … … 128 129 # where things like log4j config files go 129 130 org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 131 org.bedework.data.dir=${org.bedework.jboss.data.dir} 130 132 131 133 # where 'endorsed' library files go. These classes override anything … … 514 516 # -------------------------------------------------------------------- 515 517 # 518 # Key generator 519 # 520 521 org.bedework.app.genkeys.project=calendarapi 522 org.bedework.app.genkeys.sou.dir= 523 org.bedework.app.genkeys.shellscr.name=bwrun 524 org.bedework.app.genkeys.batscr.name=bwrun.bat 525 org.bedework.app.genkeys.zip.name=genkeys 526 org.bedework.app.genkeys.description=Bedework system Key generator 527 528 # 529 # -------------------------------------------------------------------- 530 # 516 531 # In/outbox scheduler 517 532 # trunk/config/bwbuild/jboss-postgresql/cal.options.xml
r2999 r3001 119 119 120 120 <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig"> 121 <privKeys>@ QUICKSTART_DIR@/data/bedework/privkeys</privKeys>122 <pubKeys>@ QUICKSTART_DIR@/data/bedework/pubkeys</pubKeys>121 <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys> 122 <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys> 123 123 124 124 <debug>true</debug> … … 565 565 566 566 <!-- ================================================================== 567 System key generator 568 ================================================================== --> 569 <genkeys classname="org.bedework.calfacade.configs.BwCrawlerConfig"> 570 <debug>true</debug> 571 <appType>genkeys</appType> 572 <guestMode>true</guestMode> 573 <debugEntity>false</debugEntity> 574 </genkeys> 575 576 <!-- ================================================================== 567 577 In/outbox scheduler program 568 578 ================================================================== --> trunk/config/bwbuild/jboss-postgresql/cal.properties
r2999 r3001 20 20 SoEDept,UserCal,Pubcaldav,Usercaldav,Pubcalws,Usercalws,caldavTest,\ 21 21 test,indexer,dumpres,\ 22 sysevlog,iosched,monitor 22 sysevlog,iosched,monitor,genkeys 23 23 24 24 # … … 130 130 # where things like log4j config files go 131 131 org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 132 org.bedework.data.dir=${org.bedework.jboss.data.dir} 132 133 133 134 # where 'endorsed' library files go. These classes override anything … … 567 568 # -------------------------------------------------------------------- 568 569 # 570 # Key generator 571 # 572 573 org.bedework.app.genkeys.project=calendarapi 574 org.bedework.app.genkeys.sou.dir= 575 org.bedework.app.genkeys.shellscr.name=bwrun 576 org.bedework.app.genkeys.batscr.name=bwrun.bat 577 org.bedework.app.genkeys.zip.name=genkeys 578 org.bedework.app.genkeys.description=Bedework system Key generator 579 580 # 581 # -------------------------------------------------------------------- 582 # 569 583 # In/outbox scheduler 570 584 # trunk/config/bwbuild/jboss/cal.options.xml
r2990 r3001 119 119 120 120 <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig"> 121 <privKeys>@ QUICKSTART_DIR@/data/bedework/privkeys</privKeys>122 <pubKeys>@ QUICKSTART_DIR@/data/bedework/pubkeys</pubKeys>121 <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys> 122 <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys> 123 123 124 124 <debug>true</debug> … … 539 539 540 540 <!-- ================================================================== 541 System key generator 542 ================================================================== --> 543 <genkeys classname="org.bedework.calfacade.configs.BwCrawlerConfig"> 544 <debug>true</debug> 545 <appType>genkeys</appType> 546 <guestMode>true</guestMode> 547 <debugEntity>false</debugEntity> 548 </genkeys> 549 550 <!-- ================================================================== 541 551 In/outbox scheduler program 542 552 ================================================================== --> trunk/config/bwbuild/jboss/cal.properties
r2995 r3001 19 19 org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\ 20 20 SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,indexer,dumpres,\ 21 sysevlog,iosched,monitor 21 sysevlog,iosched,monitor,genkeys 22 22 23 23 # … … 131 131 # where things like log4j config files go 132 132 org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 133 org.bedework.data.dir=${org.bedework.jboss.data.dir} 133 134 134 135 # where 'endorsed' library files go. These classes override anything … … 520 521 # -------------------------------------------------------------------- 521 522 # 523 # Key generator 524 # 525 526 org.bedework.app.genkeys.project=calendarapi 527 org.bedework.app.genkeys.sou.dir= 528 org.bedework.app.genkeys.shellscr.name=bwrun 529 org.bedework.app.genkeys.batscr.name=bwrun.bat 530 org.bedework.app.genkeys.zip.name=genkeys 531 org.bedework.app.genkeys.description=Bedework system Key generator 532 533 # 534 # -------------------------------------------------------------------- 535 # 522 536 # In/outbox scheduler 523 537 #
