Changeset 3169
- Timestamp:
- 02/12/11 19:13:29
- Files:
-
- releases/bedework-3.7/bedework-cleanup.xml (added)
- releases/bedework-3.7/build/buildTools/deftasks.xml (modified) (1 diff)
- releases/bedework-3.7/build/buildTools/xjc.xml (modified) (2 diffs)
- releases/bedework-3.7/build/buildsh.xml (modified) (1 diff)
- releases/bedework-3.7/build/buildwar.xml (modified) (1 diff)
- releases/bedework-3.7/build/quickstart/linux/bw (modified) (3 diffs)
- releases/bedework-3.7/config/bwbuild/default/build.properties (modified) (1 diff)
- releases/bedework-3.7/config/bwbuild/default/cal.options.xml (modified) (8 diffs)
- releases/bedework-3.7/config/bwbuild/default/cal.properties (modified) (7 diffs)
- releases/bedework-3.7/config/bwbuild/default/carddav.options.xml (deleted)
- releases/bedework-3.7/config/bwbuild/default/log4j.xml (modified) (2 diffs)
- releases/bedework-3.7/config/bwbuild/jboss-h2/build.properties (modified) (1 diff)
- releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml (modified) (1 diff)
- releases/bedework-3.7/config/bwbuild/jboss-h2/cal.properties (modified) (12 diffs)
- releases/bedework-3.7/config/bwbuild/jboss-h2/carddav.options.xml (deleted)
- releases/bedework-3.7/config/bwbuild/jboss-h2/log4j.xml (modified) (2 diffs)
- releases/bedework-3.7/config/bwbuild/jboss-mysql/build.properties (modified) (1 diff)
- releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml (modified) (8 diffs)
- releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.properties (modified) (8 diffs)
- releases/bedework-3.7/config/bwbuild/jboss-mysql/carddav.options.xml (deleted)
- releases/bedework-3.7/config/bwbuild/jboss-mysql/log4j.xml (modified) (2 diffs)
- releases/bedework-3.7/config/bwbuild/jboss-postgresql/build.properties (modified) (1 diff)
- releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml (modified) (7 diffs)
- releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.properties (modified) (2 diffs)
- releases/bedework-3.7/config/bwbuild/jboss-postgresql/carddav.options.xml (deleted)
- releases/bedework-3.7/config/bwbuild/jboss-postgresql/log4j.xml (modified) (2 diffs)
- releases/bedework-3.7/deployment/build.xml (modified) (1 diff)
- releases/bedework-3.7/deployutil/src/org/bedework/deployment/ForAppTask.java (added)
- releases/bedework-3.7/deployutil/src/org/bedework/deployment/ForEachAppTask.java (modified) (6 diffs)
- releases/bedework-3.7/deployutil/src/org/bedework/deployment/MakeLangXsl.java (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
releases/bedework-3.7/build/buildTools/deftasks.xml
r3135 r3169 18 18 <taskdef name="forEachApp" 19 19 classname="org.bedework.deployment.ForEachAppTask"> 20 <classpath refid="build.cp"/> 21 </taskdef> 22 23 <taskdef name="forApp" 24 classname="org.bedework.deployment.ForAppTask"> 20 25 <classpath refid="build.cp"/> 21 26 </taskdef> releases/bedework-3.7/build/buildTools/xjc.xml
r3163 r3169 30 30 <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 31 31 32 < property name="sourcedestdir" location="@{module-base}/src" />32 <var name="sourcedestdir" value="@{module-base}/src" /> 33 33 34 <dirname property="org.bedework. wsdl.dir" file="@{wsdl}"/>34 <dirname property="org.bedework.schema.dir" file="@{schema}"/> 35 35 36 36 <if> … … 38 38 <available file="${sourcedestdir}" type="dir" /> 39 39 <uptodate targetfile="@{jar-file}" > 40 <srcfiles dir="${org.bedework. wsdl.dir}" />40 <srcfiles dir="${org.bedework.schema.dir}" /> 41 41 </uptodate> 42 42 </and> releases/bedework-3.7/build/buildsh.xml
r3147 r3169 94 94 95 95 <copy tofile="${app.dest.properties}/options.xml" 96 file="${org.bedework. options.file}" >96 file="${org.bedework.config.options}" > 97 97 <filterset> 98 98 <filter token="RPI-DEBUG" value="${app.debug.val}"/> releases/bedework-3.7/build/buildwar.xml
r3104 r3169 167 167 168 168 <copy tofile="${app.dest.properties}/options.xml" 169 file="${org.bedework. options.file}" >169 file="${org.bedework.config.options}" > 170 170 <filterset> 171 171 <filter token="RPI-DEBUG" value="${app.debug.val}"/> releases/bedework-3.7/build/quickstart/linux/bw
r3146 r3169 244 244 pkgdefault=yes 245 245 bedework= 246 bwxmlschema= 246 247 carddav= 247 248 caldav= … … 348 349 ;; 349 350 # ------------------------Projects 351 -bwxml) 352 bwxmlschema="yes" 353 pkgdefault= 354 shift 355 ;; 350 356 -carddav) 351 357 carddav="yes" … … 429 435 echo "BWCONFIG=$BWCONFIG" 430 436 437 if [ "$bwxmlschema" != "" ] ; then 438 cd $QUICKSTART_HOME/bwxml-schema 439 fi 440 431 441 if [ "$caldav" != "" ] ; then 432 442 cd $QUICKSTART_HOME/bedework/projects/caldav releases/bedework-3.7/config/bwbuild/default/build.properties
r3097 r3169 28 28 29 29 org.bedework.config.sysevents.properties=${env.BEDEWORK_CONFIG}/sysevents.properties 30 31 org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml32 releases/bedework-3.7/config/bwbuild/default/cal.options.xml
r3062 r3169 1 <?xml version="1.0"?> 2 1 3 <!-- This provides run time options for each of the configured applications. 2 4 --> … … 68 70 </caladdrPrefixes> 69 71 --> 72 73 <!-- =============================================================== 74 CardDAV directory handlers 75 =============================================================== --> 76 77 <dirhandlers> 78 <!-- handle the principal hierarchy. 79 This could be a read-only interface if we don't intend to allow 80 modification of the enterprise directory. 81 82 However, we may need to merge in subsidiary information to handle 83 principal properties. That may mean maintaining a shadow 84 principal hierarchy in the local server. 85 86 Each element name below must be unique. 87 --> 88 <principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 89 <pathPrefix>/principals</pathPrefix> 90 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 91 92 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 93 <providerUrl>ldap://localhost:10389/</providerUrl> 94 <baseDn>dc=bedework, dc=org</baseDn> 95 96 <queryLimit>1000</queryLimit> 97 98 <!-- We need to get operational attributes from the directory. 99 This requires us to explicitly name all attributes on fetch. 100 This element allows us to name EXTRA attributes from the default 101 list provided by the implementation. 102 --> 103 <attrIds></attrIds> 104 105 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 106 <addressbookIdAttr>ou</addressbookIdAttr> 107 108 <authDn>uid=admin,ou=system</authDn> 109 <authPw>secret</authPw> 110 111 <debug>true</debug> 112 </principal-dirHandler> 113 114 <user-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 115 <pathPrefix>/principals/users</pathPrefix> 116 <addressBook>true</addressBook> 117 118 <!-- The cardPathPrefix is used to manufacture a path to a card for 119 the principal. If it is set we take the path 120 121 <principal-root>/<account> 122 123 and transform it to 124 125 <cardPathPrefix>/<account>.vcf 126 127 If it is not set we try the cardPathPrefixes supplied globally. 128 If they are not supplied we don't give any path. The client will 129 have to fall back to a query. 130 --> 131 <cardPathPrefix>/public/people</cardPathPrefix> 132 133 <cardPathPrefixes>/public/people,loc_:/public/locations</cardPathPrefixes> 134 135 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 136 137 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 138 <providerUrl>ldap://localhost:10389/</providerUrl> 139 <baseDn>ou=accounts,dc=bedework,dc=org</baseDn> 140 141 <queryLimit>1000</queryLimit> 142 143 <attrIds></attrIds> 144 145 <cardKind>individual</cardKind> 146 147 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 148 <addressbookIdAttr>ou</addressbookIdAttr> 149 150 <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass> 151 <addressbookEntryIdAttr>uid</addressbookEntryIdAttr> 152 153 <principalIdAttr>uid</principalIdAttr> 154 155 <authDn>uid=admin,ou=system</authDn> 156 <authPw>secret</authPw> 157 158 <debug>true</debug> 159 </user-principal-dirHandler> 160 161 <group-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 162 <pathPrefix>/principals/groups</pathPrefix> 163 <addressBook>true</addressBook> 164 165 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 166 167 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 168 <providerUrl>ldap://localhost:10389/</providerUrl> 169 170 <baseDn>ou=groups,dc=bedework,dc=org</baseDn> 171 172 <queryLimit>1000</queryLimit> 173 174 <attrIds></attrIds> 175 176 <cardKind>group</cardKind> 177 178 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 179 <addressbookIdAttr>ou</addressbookIdAttr> 180 181 <addressbookEntryObjectClass>groupOfUniqueNames</addressbookEntryObjectClass> 182 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 183 184 <principalIdAttr>cn</principalIdAttr> 185 186 <authDn>uid=admin,ou=system</authDn> 187 <authPw>secret</authPw> 188 189 <debug>true</debug> 190 </group-principal-dirHandler> 191 192 <location-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 193 <pathPrefix>/principals/locations</pathPrefix> 194 <addressBook>true</addressBook> 195 <cardPathPrefix>/public/locations</cardPathPrefix> 196 197 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 198 199 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 200 <providerUrl>ldap://localhost:10389/</providerUrl> 201 202 <baseDn>ou=locations,dc=bedework,dc=org</baseDn> 203 204 <queryLimit>1000</queryLimit> 205 206 <attrIds></attrIds> 207 208 <cardKind>location</cardKind> 209 210 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 211 <addressbookIdAttr>ou</addressbookIdAttr> 212 213 <addressbookEntryObjectClass>groupOfUniqueNames</addressbookEntryObjectClass> 214 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 215 216 <principalIdAttr>cn</principalIdAttr> 217 218 <authDn>uid=admin,ou=system</authDn> 219 <authPw>secret</authPw> 220 221 <debug>true</debug> 222 </location-principal-dirHandler> 223 224 <!-- handle the public (enterprise) people address book hierarchy --> 225 <public-people-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 226 <pathPrefix>/public/people</pathPrefix> 227 228 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className> 229 230 <!-- manufacture an owner for public entities --> 231 <ownerHref>/principals/users/admin</ownerHref> 232 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 233 <providerUrl>ldap://localhost:10389/</providerUrl> 234 <baseDn>ou=people,ou=public,dc=bedework,dc=org</baseDn> 235 <queryLimit>1000</queryLimit> 236 237 <attrIds></attrIds> 238 239 <folderObjectClass>organizationalUnit</folderObjectClass> 240 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 241 <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass> 242 <folderIdAttr>ou</folderIdAttr> 243 <addressbookIdAttr>ou</addressbookIdAttr> 244 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 245 246 <authDn>uid=admin,ou=system</authDn> 247 <authPw>secret</authPw> 248 <debug>true</debug> 249 </public-people-dirHandler> 250 251 252 <!-- handle the user address book hierarchy --> 253 254 <user-dirHandler classname="org.bedework.carddav.util.DbDirHandlerConfig" > 255 <pathPrefix>/user</pathPrefix> 256 257 <className>org.bedework.carddav.server.dirHandlers.db.DbAddrBookDirHandler</className> 258 259 <queryLimit>1000</queryLimit> <!-- unimplemented --> 260 261 <!-- This is the access set at the root. I'll do this as XML soon --> 262 <rootAccess>WONyA WANyFyS </rootAccess> 263 264 <!-- This is the owner of the user root and user home --> 265 <rootOwner>/principals/users/root</rootOwner> 266 267 <debug>true</debug> 268 </user-dirHandler> 269 270 <!-- handle the user address book hierarchy 271 How it might be done with ldap 272 <user-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 273 <pathPrefix>/user</pathPrefix> 274 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className> 275 276 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 277 <providerUrl>ldap://localhost:10389/</providerUrl> 278 279 <baseDn>ou=users,ou=addrbooks,dc=bedework,dc=org</baseDn> 280 281 <queryLimit>1000</queryLimit> 282 283 <attrIds></attrIds> 284 285 <folderObjectClass>organizationalUnit</folderObjectClass> 286 <folderIdAttr>ou</folderIdAttr> 287 288 <addressbookObjectClass>addressBook</addressbookObjectClass> 289 <addressbookIdAttr>ou</addressbookIdAttr> 290 291 <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass> 292 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 293 294 <authDn>uid=admin,ou=system</authDn> 295 <authPw>secret</authPw> 296 <debug>true</debug> 297 </user-dirHandler> 298 --> 299 300 <public-locations-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 301 <pathPrefix>/public/locations</pathPrefix> 302 303 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className> 304 305 <!-- manufacture an owner for public entities --> 306 <ownerHref>/principals/users/admin</ownerHref> 307 308 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 309 <providerUrl>ldap://localhost:10389/</providerUrl> 310 <baseDn>ou=locations,ou=public,dc=bedework,dc=org</baseDn> 311 312 <queryLimit>1000</queryLimit> 313 314 <attrIds></attrIds> 315 316 <cardKind>location</cardKind> 317 318 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 319 <addressbookIdAttr>ou</addressbookIdAttr> 320 321 <addressbookEntryObjectClass>CalendarResource</addressbookEntryObjectClass> 322 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 323 324 <principalIdAttr>calcaladruri</principalIdAttr> 325 326 <authDn>uid=admin,ou=system</authDn> 327 <authPw>secret</authPw> 328 329 <debug>true</debug> 330 </public-locations-dirHandler> 331 332 <!-- handle the public (enterprise) address book hierarchy --> 333 <public-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 334 <pathPrefix>/public</pathPrefix> 335 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className> 336 337 <!-- manufacture an owner for public entities --> 338 <ownerHref>/principals/users/admin</ownerHref> 339 340 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 341 <providerUrl>ldap://localhost:10389/</providerUrl> 342 343 <baseDn>ou=public,dc=bedework,dc=org</baseDn> 344 345 <queryLimit>1000</queryLimit> 346 347 <attrIds></attrIds> 348 349 <folderObjectClass>organizationalUnit</folderObjectClass> 350 <addressbookObjectClass>addressBook</addressbookObjectClass> 351 <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass> 352 353 <folderIdAttr>ou</folderIdAttr> 354 <addressbookIdAttr>ou</addressbookIdAttr> 355 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 356 357 <authDn>uid=admin,ou=system</authDn> 358 <authPw>secret</authPw> 359 <debug>true</debug> 360 </public-dirHandler> 361 </dirhandlers> 70 362 363 <!-- =============================================================== 364 Calendar system modules 365 =============================================================== --> 366 71 367 <module> 72 368 <!-- A dummy module with no directory. --> … … 176 472 177 473 <app> 178 <!-- =============================================================== ===474 <!-- =============================================================== 179 475 Timezones server 180 =============================================================== ===-->476 =============================================================== --> 181 477 <tzsvr classname="org.bedework.timezones.common.TzsvrConfig"> 182 478 <appType>tzsvr</appType> … … 193 489 </tzsvr> 194 490 195 <!-- =============================================================== ===491 <!-- =============================================================== 196 492 Config web client 197 =============================================================== ===-->493 =============================================================== --> 198 494 <bwconfig classname="org.bedework.calfacade.configs.ConfigCommon"> 199 495 <appType>webconfig</appType> … … 202 498 </bwconfig> 203 499 204 <!-- =============================================================== ===500 <!-- =============================================================== 205 501 Admin web client CalAdmin 206 502 ================================================================== --> … … 426 722 </UserCal> 427 723 428 <!-- =============================================================== ===724 <!-- =============================================================== 429 725 User CalDAV server UserCalDAV 430 =============================================================== ===-->726 =============================================================== --> 431 727 <Usercaldav classname="org.bedework.caldav.util.CalDAVConfig"> 432 728 <appType>usercaldav</appType> … … 586 882 </iosched> 587 883 884 <!-- ================================================================== 885 Exchange synch 886 ================================================================== --> 588 887 <Exsynch classname="org.bedework.exchgsynch.ExsynchConfig"> 589 888 <appType>exsynch</appType> … … 593 892 594 893 <!-- Exchange sync callback. Comment out for no service --> 595 <exchangeWsPushURI>http:// myexhange.mysite.edu/exsynch/</exchangeWsPushURI>894 <exchangeWsPushURI>http://128.113.124.221/exsynch/</exchangeWsPushURI> 596 895 597 896 <!-- Path to keystore - comment out to use default --> 598 897 <keystore>@APPSERVER-DATA-DIR@/exsynchcerts</keystore> 898 899 <!-- location of the WSDL for the remote web service --> 900 <remoteWSDLURI>http://localhost:8080/exchange/wssvc.wsdl</remoteWSDLURI> 901 902 <remoteWsURL>http://localhost:8080/pubcaldav/exsynchws/</remoteWsURL> 903 904 <!-- seconds --> 905 <remoteKeepAliveInterval>60</remoteKeepAliveInterval> 599 906 </Exsynch> 907 908 <!-- =============================================================== 909 User CardDAV server usercarddav 910 =============================================================== --> 911 <usercarddav classname="org.bedework.carddav.util.CardDAVConfig" > 912 <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl> 913 914 <webaddrServiceURI>/find</webaddrServiceURI> 915 <webaddrServicePropertiesList>fn,email,note,org</webaddrServicePropertiesList> 916 <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook> 917 918 <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed> 919 920 <defaultAddressbook>addressbook</defaultAddressbook> 921 922 <!-- This will act as the root for the file system --> 923 <addressBookHandlerPrefix>/user</addressBookHandlerPrefix> 924 925 <!-- Needed for access calculations --> 926 <userHomeRoot>/user</userHomeRoot> 927 928 <principalRoot>/principals</principalRoot> 929 <userPrincipalRoot>/principals/users</userPrincipalRoot> 930 <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 931 <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 932 <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 933 <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 934 <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 935 </usercarddav> 936 937 <!-- =============================================================== 938 Public CardDAV server pubcarddav 939 =============================================================== --> 940 <pubcarddav classname="org.bedework.carddav.util.CardDAVConfig" > 941 <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl> 942 943 <webaddrServiceURI>/find</webaddrServiceURI> 944 <webaddrServicePropertiesList>fn,note,org</webaddrServicePropertiesList> 945 <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook> 946 947 <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed> 948 949 <defaultAddressbook>addressbook</defaultAddressbook> 950 951 <addressBookHandlerPrefix>/public</addressBookHandlerPrefix> 952 953 <!-- Needed for access calculations --> 954 <userHomeRoot>/user</userHomeRoot> 955 956 <principalRoot>/principals</principalRoot> 957 <userPrincipalRoot>/principals/users</userPrincipalRoot> 958 <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 959 <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 960 <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 961 <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 962 <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 963 </pubcarddav> 600 964 </app> 601 965 </bedework> releases/bedework-3.7/config/bwbuild/default/cal.properties
r3147 r3169 50 50 org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS 51 51 org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS 52 org.bedework.global.jboss.exsynch.datasource.jndiname=/ExsynchDS 52 53 53 54 # Hibernate caching parameters … … 129 130 appserver.lib.dir=${org.bedework.jboss.config.dir}/lib 130 131 131 # where datafiles go132 # where things like log4j config files go 132 133 org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 133 134 org.bedework.data.dir=${org.bedework.jboss.data.dir} … … 149 150 # If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml 150 151 org.bedework.global.copy.bedeworkcardds.config=yes 152 # 153 # If set to true or yes will copy in the bedework exchange synch db datasource def 154 org.bedework.global.copy.bedeworkexsynchds.config=yes 151 155 152 156 # ------------------------------------------------------------------------ … … 194 198 org.bedework.app.tzsvr.context.root=/tzsvr 195 199 # Set for jboss 196 #org.bedework.app.tzsvr.virtual.host= 200 #org.bedework.app.tzsvr.virtual.host=my.host1,my.host.2 197 201 198 202 org.bedework.app.tzsvr.description=Bedework timezones server. … … 434 438 # -------------------------------------------------------------------- 435 439 # 440 # Public Calws Server 441 # 442 org.bedework.app.Pubcalws.project=caldav 443 org.bedework.app.Pubcalws.sou.dir=server 444 org.bedework.app.Pubcalws.interface.jar=bw-caldav 445 446 org.bedework.app.Pubcalws.web.xml=war/WEB-INF/publicws-web.xml 447 org.bedework.app.Pubcalws.tomcat.context.xml=war/META-INF/publiccontext.xml 448 org.bedework.app.Pubcalws.war.name=Pubcalws 449 org.bedework.app.Pubcalws.context.root=/Pubcalws 450 # Set for jboss 451 #org.bedework.app.Pubcalws.virtual.host= 452 453 org.bedework.app.Pubcalws.description=Bedework public calws server. 454 org.bedework.app.Pubcalws.display.name=Bedework public calws 455 org.bedework.app.Pubcalws.name=DemoPubcalws 456 org.bedework.app.Pubcalws.deploy.dir=${org.bedework.appserver.deploy.dir} 457 org.bedework.app.Pubcalws.logprefix=Pubcalws 458 459 # 460 # -------------------------------------------------------------------- 461 # 462 # Personal Calws Server 463 # 464 org.bedework.app.Usercalws.project=caldav 465 org.bedework.app.Usercalws.sou.dir=server 466 org.bedework.app.Usercalws.interface.jar=bw-caldav 467 468 org.bedework.app.Usercalws.web.xml=war/WEB-INF/userws-web.xml 469 org.bedework.app.Usercalws.tomcat.context.xml=war/META-INF/usercontext.xml 470 org.bedework.app.Usercalws.war.name=ucalws 471 org.bedework.app.Usercalws.context.root=/ucalws 472 # Set for jboss 473 #org.bedework.app.Usercalws.virtual.host= 474 475 org.bedework.app.Usercalws.security.domain=bedeworkdemo 476 org.bedework.app.Usercalws.security.prefix=demo 477 org.bedework.app.Usercalws.transport.guarantee=NONE 478 479 org.bedework.app.Usercalws.description=Bedework user calws server. 480 org.bedework.app.Usercalws.display.name=Bedework Usercalws 481 org.bedework.app.Usercalws.name=DemoUsrcalws 482 org.bedework.app.Usercalws.deploy.dir=${org.bedework.appserver.deploy.dir} 483 org.bedework.app.Usercalws.logprefix=Usercalws 484 485 # 486 # -------------------------------------------------------------------- 487 # 436 488 # CalDAV test 437 489 # … … 539 591 org.bedework.app.iosched.project=calendarapi 540 592 org.bedework.app.iosched.sou.dir= 593 org.bedework.app.iosched.in.ear=true 541 594 org.bedework.app.iosched.shellscr.name=bwrun 542 595 org.bedework.app.iosched.batscr.name=bwrun.bat … … 544 597 org.bedework.app.iosched.description=Bedework In/outbox scheduler application 545 598 546 599 # 600 # -------------------------------------------------------------------- 601 # 602 # Public Carddav Server 603 # 604 org.bedework.app.pubcarddav.project=carddav 605 org.bedework.app.pubcarddav.sou.dir=server 606 607 org.bedework.app.pubcarddav.web.xml=war/WEB-INF/publicweb.xml 608 org.bedework.app.pubcarddav.war.name=pubcarddav 609 org.bedework.app.pubcarddav.context.root=/pubcarddav 610 # Set for jboss 611 #org.bedework.app.pubcarddav.virtual.host=calendars.rpi.edu 612 613 org.bedework.app.pubcarddav.description=Bedework public carddav server. 614 org.bedework.app.pubcarddav.display.name=Bedework public carddav 615 org.bedework.app.pubcarddav.name=Demopubcarddav 616 org.bedework.app.pubcarddav.deploy.dir=${org.bedework.appserver.deploy.dir} 617 org.bedework.app.pubcarddav.logprefix=pubcarddav 618 619 # 620 # -------------------------------------------------------------------- 621 # 622 # Personal Carddav Server 623 # 624 org.bedework.app.usercarddav.project=carddav 625 org.bedework.app.usercarddav.sou.dir=server 626 627 org.bedework.app.usercarddav.web.xml=war/WEB-INF/userweb.xml 628 org.bedework.app.usercarddav.war.name=ucarddav 629 org.bedework.app.usercarddav.context.root=/ucarddav 630 # Set for jboss 631 #org.bedework.app.usercarddav.virtual.host=events.rpi.edu 632 633 org.bedework.app.usercarddav.security.domain=bedeworkdemo 634 org.bedework.app.usercarddav.security.prefix=demo 635 org.bedework.app.usercarddav.transport.guarantee=NONE 636 637 org.bedework.app.usercarddav.description=Bedework user carddav server. 638 org.bedework.app.usercarddav.display.name=Bedework usercarddav 639 org.bedework.app.usercarddav.name=DemoUsrcarddav 640 org.bedework.app.usercarddav.deploy.dir=${org.bedework.appserver.deploy.dir} 641 org.bedework.app.usercarddav.logprefix=usercarddav 642 releases/bedework-3.7/config/bwbuild/default/log4j.xml
r3097 r3169 386 386 </category> 387 387 388 <!-- 388 389 <category name="org.bedework.calsvc.CalSvc$SvcSimpleFilterParser"> 389 390 <priority value="${org.bedework.loglevel.exprfilters}"/> … … 398 399 </category> 399 400 400 <category name="org.bedework.calcore.AccessUtil">401 <priority value="INFO"/>402 </category>403 404 401 <category name="org.bedework.client.FilterBuilder"> 405 402 <priority value="${org.bedework.loglevel.exprfilters}"/> 403 </category> 404 --> 405 <category name="org.bedework.calsvc.CalSvc$SvcSimpleFilterParser"> 406 <priority value="INFO"/> 407 </category> 408 409 <category name="org.bedework.calsvc.client.FilterBuilder"> 410 <priority value="INFO"/> 411 </category> 412 413 <category name="org.hibernate.tool.hbm2ddl.SchemaExport"> 414 <priority value="INFO"/> 415 </category> 416 417 <category name="org.bedework.client.FilterBuilder"> 418 <priority value="INFO"/> 419 </category> 420 421 <category name="org.bedework.calcore.AccessUtil"> 422 <priority value="INFO"/> 406 423 </category> 407 424 releases/bedework-3.7/config/bwbuild/jboss-h2/build.properties
r3097 r3169 28 28 29 29 org.bedework.config.sysevents.properties=${env.BEDEWORK_CONFIG}/sysevents.properties 30 31 org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml32 releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml
r3062 r3169 1 <?xml version="1.0"?> 2 1 3 <!-- This provides run time options for each of the configured applications. 2 4 --> releases/bedework-3.7/config/bwbuild/jboss-h2/cal.properties
r3147 r3169 43 43 org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS 44 44 org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS 45 org.bedework.global.jboss.exsynch.datasource.jndiname=/ExsynchDS 45 46 46 47 # Hibernate caching parameters … … 101 102 102 103 # A list of jars to copy, delimited by "," 103 org.bedework.global.extra.jars=${org.bedework.project.bedework}/projects/rpiutil/dist/rpiutil- 3.6.jar104 org.bedework.global.extra.jars=${org.bedework.project.bedework}/projects/rpiutil/dist/rpiutil-${org.bedework.rpiutil.version}.jar 104 105 105 106 # ------------------------------------------------------------------------ … … 122 123 appserver.lib.dir=${org.bedework.jboss.config.dir}/lib 123 124 124 # where datafiles go125 # where things like log4j config files go 125 126 org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 126 127 org.bedework.data.dir=${org.bedework.jboss.data.dir} … … 136 137 # The log4j config file destination 137 138 org.bedework.log4j.config=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf/jboss-log4j.xml 138 139 # ------------------------------------------------------------------------140 # Parameters for shell apps - set the db name in the url below141 # ------------------------------------------------------------------------142 143 org.bedework.global.jdbcdriver=org.h2.Driver144 org.bedework.global.jdbcurl=jdbc:h2:tcp://localhost:9092/${org.bedework.jboss.data.dir}/h2/CalDb3p6145 org.bedework.global.jdbcid=sa146 org.bedework.global.jdbcpw=bw147 148 #org.bedework.global.jdbcdriver=org.apache.derby.jdbc.EmbeddedDriver149 #org.bedework.global.jdbcurl=jdbc:derby:${org.bedework.jboss.data.dir}/derby/CalDb3p6150 #org.bedework.global.jdbcid=sa151 #org.bedework.global.jdbcpw=152 139 # 153 140 # If set to true or yes will copy in the bedework db datasource def bedework-ds.xml … … 156 143 # If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml 157 144 org.bedework.global.copy.bedeworkcardds.config=yes 145 # 146 # If set to true or yes will copy in the bedework exchange synch db datasource def 147 org.bedework.global.copy.bedeworkexsynchds.config=yes 158 148 159 149 # ------------------------------------------------------------------------ … … 201 191 org.bedework.app.tzsvr.context.root=/tzsvr 202 192 # Set for jboss 203 #org.bedework.app.tzsvr.virtual.host= 193 #org.bedework.app.tzsvr.virtual.host=my.host1,my.host.2 204 194 205 195 org.bedework.app.tzsvr.description=Bedework timezones server. … … 441 431 # -------------------------------------------------------------------- 442 432 # 433 # Public Calws Server 434 # 435 org.bedework.app.Pubcalws.project=caldav 436 org.bedework.app.Pubcalws.sou.dir=server 437 org.bedework.app.Pubcalws.interface.jar=bw-caldav 438 439 org.bedework.app.Pubcalws.web.xml=war/WEB-INF/publicws-web.xml 440 org.bedework.app.Pubcalws.tomcat.context.xml=war/META-INF/publiccontext.xml 441 org.bedework.app.Pubcalws.war.name=Pubcalws 442 org.bedework.app.Pubcalws.context.root=/Pubcalws 443 # Set for jboss 444 #org.bedework.app.Pubcalws.virtual.host= 445 446 org.bedework.app.Pubcalws.description=Bedework public calws server. 447 org.bedework.app.Pubcalws.display.name=Bedework public calws 448 org.bedework.app.Pubcalws.name=DemoPubcalws 449 org.bedework.app.Pubcalws.deploy.dir=${org.bedework.appserver.deploy.dir} 450 org.bedework.app.Pubcalws.logprefix=Pubcalws 451 452 # 453 # -------------------------------------------------------------------- 454 # 455 # Personal Calws Server 456 # 457 org.bedework.app.Usercalws.project=caldav 458 org.bedework.app.Usercalws.sou.dir=server 459 org.bedework.app.Usercalws.interface.jar=bw-caldav 460 461 org.bedework.app.Usercalws.web.xml=war/WEB-INF/userws-web.xml 462 org.bedework.app.Usercalws.tomcat.context.xml=war/META-INF/usercontext.xml 463 org.bedework.app.Usercalws.war.name=ucalws 464 org.bedework.app.Usercalws.context.root=/ucalws 465 # Set for jboss 466 #org.bedework.app.Usercalws.virtual.host= 467 468 org.bedework.app.Usercalws.security.domain=bedeworkdemo 469 org.bedework.app.Usercalws.security.prefix=demo 470 org.bedework.app.Usercalws.transport.guarantee=NONE 471 472 org.bedework.app.Usercalws.description=Bedework user calws server. 473 org.bedework.app.Usercalws.display.name=Bedework Usercalws 474 org.bedework.app.Usercalws.name=DemoUsrcalws 475 org.bedework.app.Usercalws.deploy.dir=${org.bedework.appserver.deploy.dir} 476 org.bedework.app.Usercalws.logprefix=Usercalws 477 478 # 479 # -------------------------------------------------------------------- 480 # 443 481 # CalDAV test 444 482 # … … 508 546 org.bedework.app.sysevlog.zip.name=bwsysevlog 509 547 org.bedework.app.sysevlog.description=Bedework system events logger application 548 org.bedework.app.sysevlog.no.defaultlibs=true 510 549 511 550 # … … 521 560 org.bedework.app.monitor.zip.name=monitor 522 561 org.bedework.app.monitor.description=Bedework system events monitor application 562 org.bedework.app.monitor.no.defaultlibs=true 523 563 524 564 # … … 534 574 org.bedework.app.genkeys.zip.name=genkeys 535 575 org.bedework.app.genkeys.description=Bedework system Key generator 576 org.bedework.app.genkeys.no.defaultlibs=true 536 577 537 578 # … … 543 584 org.bedework.app.iosched.project=calendarapi 544 585 org.bedework.app.iosched.sou.dir= 586 org.bedework.app.iosched.in.ear=true 545 587 org.bedework.app.iosched.shellscr.name=bwrun 546 588 org.bedework.app.iosched.batscr.name=bwrun.bat … … 548 590 org.bedework.app.iosched.description=Bedework In/outbox scheduler application 549 591 550 592 # 593 # -------------------------------------------------------------------- 594 # 595 # Public Carddav Server 596 # 597 org.bedework.app.pubcarddav.project=carddav 598 org.bedework.app.pubcarddav.sou.dir=server 599 600 org.bedework.app.pubcarddav.web.xml=war/WEB-INF/publicweb.xml 601 org.bedework.app.pubcarddav.war.name=pubcarddav 602 org.bedework.app.pubcarddav.context.root=/pubcarddav 603 # Set for jboss 604 #org.bedework.app.pubcarddav.virtual.host=calendars.rpi.edu 605 606 org.bedework.app.pubcarddav.description=Bedework public carddav server. 607 org.bedework.app.pubcarddav.display.name=Bedework public carddav 608 org.bedework.app.pubcarddav.name=Demopubcarddav 609 org.bedework.app.pubcarddav.deploy.dir=${org.bedework.appserver.deploy.dir} 610 org.bedework.app.pubcarddav.logprefix=pubcarddav 611 612 # 613 # -------------------------------------------------------------------- 614 # 615 # Personal Carddav Server 616 # 617 org.bedework.app.usercarddav.project=carddav 618 org.bedework.app.usercarddav.sou.dir=server 619 620 org.bedework.app.usercarddav.web.xml=war/WEB-INF/userweb.xml 621 org.bedework.app.usercarddav.war.name=ucarddav 622 org.bedework.app.usercarddav.context.root=/ucarddav 623 # Set for jboss 624 #org.bedework.app.usercarddav.virtual.host=events.rpi.edu 625 626 org.bedework.app.usercarddav.security.domain=bedeworkdemo 627 org.bedework.app.usercarddav.security.prefix=demo 628 org.bedework.app.usercarddav.transport.guarantee=NONE 629 630 org.bedework.app.usercarddav.description=Bedework user carddav server. 631 org.bedework.app.usercarddav.display.name=Bedework usercarddav 632 org.bedework.app.usercarddav.name=DemoUsrcarddav 633 org.bedework.app.usercarddav.deploy.dir=${org.bedework.appserver.deploy.dir} 634 org.bedework.app.usercarddav.logprefix=usercarddav 635 releases/bedework-3.7/config/bwbuild/jboss-h2/log4j.xml
r3097 r3169 386 386 </category> 387 387 388 <!-- 388 389 <category name="org.bedework.calsvc.CalSvc$SvcSimpleFilterParser"> 389 390 <priority value="${org.bedework.loglevel.exprfilters}"/> … … 398 399 </category> 399 400 400 <category name="org.bedework.calcore.AccessUtil">401 <priority value="INFO"/>402 </category>403 404 401 <category name="org.bedework.client.FilterBuilder"> 405 402 <priority value="${org.bedework.loglevel.exprfilters}"/> 403 </category> 404 --> 405 <category name="org.bedework.calsvc.CalSvc$SvcSimpleFilterParser"> 406 <priority value="INFO"/> 407 </category> 408 409 <category name="org.bedework.calsvc.client.FilterBuilder"> 410 <priority value="INFO"/> 411 </category> 412 413 <category name="org.hibernate.tool.hbm2ddl.SchemaExport"> 414 <priority value="INFO"/> 415 </category> 416 417 <category name="org.bedework.client.FilterBuilder"> 418 <priority value="INFO"/> 419 </category> 420 421 <category name="org.bedework.calcore.AccessUtil"> 422 <priority value="INFO"/> 406 423 </category> 407 424 releases/bedework-3.7/config/bwbuild/jboss-mysql/build.properties
r3097 r3169 28 28 29 29 org.bedework.config.sysevents.properties=${env.BEDEWORK_CONFIG}/sysevents.properties 30 31 org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml32 releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml
r3062 r3169 1 <?xml version="1.0"?> 2 1 3 <!-- This provides run time options for each of the configured applications. 2 4 --> … … 68 70 </caladdrPrefixes> 69 71 --> 72 73 <!-- =============================================================== 74 CardDAV directory handlers 75 =============================================================== --> 76 77 <dirhandlers> 78 <!-- handle the principal hierarchy. 79 This could be a read-only interface if we don't intend to allow 80 modification of the enterprise directory. 81 82 However, we may need to merge in subsidiary information to handle 83 principal properties. That may mean maintaining a shadow 84 principal hierarchy in the local server. 85 86 Each element name below must be unique. 87 --> 88 <principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 89 <pathPrefix>/principals</pathPrefix> 90 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 91 92 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 93 <providerUrl>ldap://localhost:10389/</providerUrl> 94 <baseDn>dc=bedework, dc=org</baseDn> 95 96 <queryLimit>1000</queryLimit> 97 98 <!-- We need to get operational attributes from the directory. 99 This requires us to explicitly name all attributes on fetch. 100 This element allows us to name EXTRA attributes from the default 101 list provided by the implementation. 102 --> 103 <attrIds></attrIds> 104 105 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 106 <addressbookIdAttr>ou</addressbookIdAttr> 107 108 <authDn>uid=admin,ou=system</authDn> 109 <authPw>secret</authPw> 110 111 <debug>true</debug> 112 </principal-dirHandler> 113 114 <user-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 115 <pathPrefix>/principals/users</pathPrefix> 116 <addressBook>true</addressBook> 117 118 <!-- The cardPathPrefix is used to manufacture a path to a card for 119 the principal. If it is set we take the path 120 121 <principal-root>/<account> 122 123 and transform it to 124 125 <cardPathPrefix>/<account>.vcf 126 127 If it is not set we try the cardPathPrefixes supplied globally. 128 If they are not supplied we don't give any path. The client will 129 have to fall back to a query. 130 --> 131 <cardPathPrefix>/public/people</cardPathPrefix> 132 133 <cardPathPrefixes>/public/people,loc_:/public/locations</cardPathPrefixes> 134 135 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 136 137 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 138 <providerUrl>ldap://localhost:10389/</providerUrl> 139 <baseDn>ou=accounts,dc=bedework,dc=org</baseDn> 140 141 <queryLimit>1000</queryLimit> 142 143 <attrIds></attrIds> 144 145 <cardKind>individual</cardKind> 146 147 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 148 <addressbookIdAttr>ou</addressbookIdAttr> 149 150 <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass> 151 <addressbookEntryIdAttr>uid</addressbookEntryIdAttr> 152 153 <principalIdAttr>uid</principalIdAttr> 154 155 <authDn>uid=admin,ou=system</authDn> 156 <authPw>secret</authPw> 157 158 <debug>true</debug> 159 </user-principal-dirHandler> 160 161 <group-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 162 <pathPrefix>/principals/groups</pathPrefix> 163 <addressBook>true</addressBook> 164 165 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 166 167 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 168 <providerUrl>ldap://localhost:10389/</providerUrl> 169 170 <baseDn>ou=groups,dc=bedework,dc=org</baseDn> 171 172 <queryLimit>1000</queryLimit> 173 174 <attrIds></attrIds> 175 176 <cardKind>group</cardKind> 177 178 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 179 <addressbookIdAttr>ou</addressbookIdAttr> 180 181 <addressbookEntryObjectClass>groupOfUniqueNames</addressbookEntryObjectClass> 182 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 183 184 <principalIdAttr>cn</principalIdAttr> 185 186 <authDn>uid=admin,ou=system</authDn> 187 <authPw>secret</authPw> 188 189 <debug>true</debug> 190 </group-principal-dirHandler> 191 192 <location-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 193 <pathPrefix>/principals/locations</pathPrefix> 194 <addressBook>true</addressBook> 195 <cardPathPrefix>/public/locations</cardPathPrefix> 196 197 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 198 199 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 200 <providerUrl>ldap://localhost:10389/</providerUrl> 201 202 <baseDn>ou=locations,dc=bedework,dc=org</baseDn> 203 204 <queryLimit>1000</queryLimit> 205 206 <attrIds></attrIds> 207 208 <cardKind>location</cardKind> 209 210 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 211 <addressbookIdAttr>ou</addressbookIdAttr> 212 213 <addressbookEntryObjectClass>groupOfUniqueNames</addressbookEntryObjectClass> 214 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 215 216 <principalIdAttr>cn</principalIdAttr> 217 218 <authDn>uid=admin,ou=system</authDn> 219 <authPw>secret</authPw> 220 221 <debug>true</debug> 222 </location-principal-dirHandler> 223 224 <!-- handle the public (enterprise) people address book hierarchy --> 225 <public-people-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 226 <pathPrefix>/public/people</pathPrefix> 227 228 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className> 229 230 <!-- manufacture an owner for public entities --> 231 <ownerHref>/principals/users/admin</ownerHref> 232 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 233 <providerUrl>ldap://localhost:10389/</providerUrl> 234 <baseDn>ou=people,ou=public,dc=bedework,dc=org</baseDn> 235 <queryLimit>1000</queryLimit> 236 237 <attrIds></attrIds> 238 239 <folderObjectClass>organizationalUnit</folderObjectClass> 240 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 241 <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass> 242 <folderIdAttr>ou</folderIdAttr> 243 <addressbookIdAttr>ou</addressbookIdAttr> 244 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 245 246 <authDn>uid=admin,ou=system</authDn> 247 <authPw>secret</authPw> 248 <debug>true</debug> 249 </public-people-dirHandler> 250 251 252 <!-- handle the user address book hierarchy --> 253 254 <user-dirHandler classname="org.bedework.carddav.util.DbDirHandlerConfig" > 255 <pathPrefix>/user</pathPrefix> 256 257 <className>org.bedework.carddav.server.dirHandlers.db.DbAddrBookDirHandler</className> 258 259 <queryLimit>1000</queryLimit> <!-- unimplemented --> 260 261 <!-- This is the access set at the root. I'll do this as XML soon --> 262 <rootAccess>WONyA WANyFyS </rootAccess> 263 264 <!-- This is the owner of the user root and user home --> 265 <rootOwner>/principals/users/root</rootOwner> 266 267 <debug>true</debug> 268 </user-dirHandler> 269 270 <!-- handle the user address book hierarchy 271 How it might be done with ldap 272 <user-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 273 <pathPrefix>/user</pathPrefix> 274 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className> 275 276 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 277 <providerUrl>ldap://localhost:10389/</providerUrl> 278 279 <baseDn>ou=users,ou=addrbooks,dc=bedework,dc=org</baseDn> 280 281 <queryLimit>1000</queryLimit> 282 283 <attrIds></attrIds> 284 285 <folderObjectClass>organizationalUnit</folderObjectClass> 286 <folderIdAttr>ou</folderIdAttr> 287 288 <addressbookObjectClass>addressBook</addressbookObjectClass> 289 <addressbookIdAttr>ou</addressbookIdAttr> 290 291 <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass> 292 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 293 294 <authDn>uid=admin,ou=system</authDn> 295 <authPw>secret</authPw> 296 <debug>true</debug> 297 </user-dirHandler> 298 --> 299 300 <public-locations-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 301 <pathPrefix>/public/locations</pathPrefix> 302 303 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className> 304 305 <!-- manufacture an owner for public entities --> 306 <ownerHref>/principals/users/admin</ownerHref> 307 308 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 309 <providerUrl>ldap://localhost:10389/</providerUrl> 310 <baseDn>ou=locations,ou=public,dc=bedework,dc=org</baseDn> 311 312 <queryLimit>1000</queryLimit> 313 314 <attrIds></attrIds> 315 316 <cardKind>location</cardKind> 317 318 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 319 <addressbookIdAttr>ou</addressbookIdAttr> 320 321 <addressbookEntryObjectClass>CalendarResource</addressbookEntryObjectClass> 322 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 323 324 <principalIdAttr>calcaladruri</principalIdAttr> 325 326 <authDn>uid=admin,ou=system</authDn> 327 <authPw>secret</authPw> 328 329 <debug>true</debug> 330 </public-locations-dirHandler> 331 332 <!-- handle the public (enterprise) address book hierarchy --> 333 <public-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 334 <pathPrefix>/public</pathPrefix> 335 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className> 336 337 <!-- manufacture an owner for public entities --> 338 <ownerHref>/principals/users/admin</ownerHref> 339 340 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 341 <providerUrl>ldap://localhost:10389/</providerUrl> 342 343 <baseDn>ou=public,dc=bedework,dc=org</baseDn> 344 345 <queryLimit>1000</queryLimit> 346 347 <attrIds></attrIds> 348 349 <folderObjectClass>organizationalUnit</folderObjectClass> 350 <addressbookObjectClass>addressBook</addressbookObjectClass> 351 <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass> 352 353 <folderIdAttr>ou</folderIdAttr> 354 <addressbookIdAttr>ou</addressbookIdAttr> 355 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 356 357 <authDn>uid=admin,ou=system</authDn> 358 <authPw>secret</authPw> 359 <debug>true</debug> 360 </public-dirHandler> 361 </dirhandlers> 70 362 363 <!-- =============================================================== 364 Calendar system modules 365 =============================================================== --> 366 71 367 <module> 72 368 <!-- A dummy module with no directory. --> … … 176 472 177 473 <app> 178 <!-- =============================================================== ===474 <!-- =============================================================== 179 475 Timezones server 180 =============================================================== ===-->476 =============================================================== --> 181 477 <tzsvr classname="org.bedework.timezones.common.TzsvrConfig"> 182 478 <appType>tzsvr</appType> … … 193 489 </tzsvr> 194 490 195 <!-- =============================================================== ===491 <!-- =============================================================== 196 492 Config web client 197 =============================================================== ===-->493 =============================================================== --> 198 494 <bwconfig classname="org.bedework.calfacade.configs.ConfigCommon"> 199 495 <appType>webconfig</appType> … … 202 498 </bwconfig> 203 499 204 <!-- =============================================================== ===500 <!-- =============================================================== 205 501 Admin web client CalAdmin 206 502 ================================================================== --> … … 426 722 </UserCal> 427 723 428 <!-- =============================================================== ===724 <!-- =============================================================== 429 725 User CalDAV server UserCalDAV 430 =============================================================== ===-->726 =============================================================== --> 431 727 <Usercaldav classname="org.bedework.caldav.util.CalDAVConfig"> 432 728 <appType>usercaldav</appType> … … 586 882 </iosched> 587 883 884 <!-- ================================================================== 885 Exchange synch 886 ================================================================== --> 588 887 <Exsynch classname="org.bedework.exchgsynch.ExsynchConfig"> 589 888 <appType>exsynch</appType> … … 597 896 <!-- Path to keystore - comment out to use default --> 598 897 <keystore>@APPSERVER-DATA-DIR@/exsynchcerts</keystore> 898 899 <!-- location of the WSDL for the remote web service --> 900 <remoteWSDLURI>http://localhost:8080/exchange/wssvc.wsdl</remoteWSDLURI> 901 902 <remoteWsURL>http://localhost:8080/pubcaldav/exsynchws/</remoteWsURL> 903 904 <!-- seconds --> 905 <remoteKeepAliveInterval>60</remoteKeepAliveInterval> 599 906 </Exsynch> 907 908 <!-- =============================================================== 909 User CardDAV server usercarddav 910 =============================================================== --> 911 <usercarddav classname="org.bedework.carddav.util.CardDAVConfig" > 912 <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl> 913 914 <webaddrServiceURI>/find</webaddrServiceURI> 915 <webaddrServicePropertiesList>fn,email,note,org</webaddrServicePropertiesList> 916 <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook> 917 918 <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed> 919 920 <defaultAddressbook>addressbook</defaultAddressbook> 921 922 <!-- This will act as the root for the file system --> 923 <addressBookHandlerPrefix>/user</addressBookHandlerPrefix> 924 925 <!-- Needed for access calculations --> 926 <userHomeRoot>/user</userHomeRoot> 927 928 <principalRoot>/principals</principalRoot> 929 <userPrincipalRoot>/principals/users</userPrincipalRoot> 930 <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 931 <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 932 <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 933 <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 934 <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 935 </usercarddav> 936 937 <!-- =============================================================== 938 Public CardDAV server pubcarddav 939 =============================================================== --> 940 <pubcarddav classname="org.bedework.carddav.util.CardDAVConfig" > 941 <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl> 942 943 <webaddrServiceURI>/find</webaddrServiceURI> 944 <webaddrServicePropertiesList>fn,note,org</webaddrServicePropertiesList> 945 <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook> 946 947 <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed> 948 949 <defaultAddressbook>addressbook</defaultAddressbook> 950 951 <addressBookHandlerPrefix>/public</addressBookHandlerPrefix> 952 953 <!-- Needed for access calculations --> 954 <userHomeRoot>/user</userHomeRoot> 955 956 <principalRoot>/principals</principalRoot> 957 <userPrincipalRoot>/principals/users</userPrincipalRoot> 958 <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 959 <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 960 <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 961 <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 962 <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 963 </pubcarddav> 600 964 </app> 601 965 </bedework> releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.properties
r3147 r3169 48 48 org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS 49 49 org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS 50 org.bedework.global.jboss.exsynch.datasource.jndiname=/ExsynchDS 50 51 51 52 # Hibernate caching parameters … … 106 107 107 108 # A list of jars to copy, delimited by "," 108 #org.bedework.global.extra.jars=${org.bedework.project.bedework}/projects/rpiutil/dist/rpiutil-3.6.jar109 org.bedework.global.extra.jars=${org.bedework.project.bedework}/projects/rpiutil/dist/rpiutil-${org.bedework.rpiutil.version}.jar 109 110 110 111 # ------------------------------------------------------------------------ … … 127 128 appserver.lib.dir=${org.bedework.jboss.config.dir}/lib 128 129 129 # where datafiles go130 # where things like log4j config files go 130 131 org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 131 132 org.bedework.data.dir=${org.bedework.jboss.data.dir} … … 143 144 # 144 145 # If set to true or yes will copy in the bedework db datasource def bedework-ds.xml 145 #org.bedework.global.copy.bedeworkds.config=yes 146 org.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 149 org.bedework.global.copy.bedeworkcardds.config=yes 150 # 151 # If set to true or yes will copy in the bedework exchange synch db datasource def 152 org.bedework.global.copy.bedeworkexsynchds.config=yes 146 153 147 154 # ------------------------------------------------------------------------ … … 189 196 org.bedework.app.tzsvr.context.root=/tzsvr 190 197 # Set for jboss 191 #org.bedework.app.tzsvr.virtual.host= 198 #org.bedework.app.tzsvr.virtual.host=my.host1,my.host.2 192 199 193 200 org.bedework.app.tzsvr.description=Bedework timezones server. … … 429 436 # -------------------------------------------------------------------- 430 437 # 438 # Public Calws Server 439 # 440 org.bedework.app.Pubcalws.project=caldav 441 org.bedework.app.Pubcalws.sou.dir=server 442 org.bedework.app.Pubcalws.interface.jar=bw-caldav 443 444 org.bedework.app.Pubcalws.web.xml=war/WEB-INF/publicws-web.xml 445 org.bedework.app.Pubcalws.tomcat.context.xml=war/META-INF/publiccontext.xml 446 org.bedework.app.Pubcalws.war.name=Pubcalws 447 org.bedework.app.Pubcalws.context.root=/Pubcalws 448 # Set for jboss 449 #org.bedework.app.Pubcalws.virtual.host= 450 451 org.bedework.app.Pubcalws.description=Bedework public calws server. 452 org.bedework.app.Pubcalws.display.name=Bedework public calws 453 org.bedework.app.Pubcalws.name=DemoPubcalws 454 org.bedework.app.Pubcalws.deploy.dir=${org.bedework.appserver.deploy.dir} 455 org.bedework.app.Pubcalws.logprefix=Pubcalws 456 457 # 458 # -------------------------------------------------------------------- 459 # 460 # Personal Calws Server 461 # 462 org.bedework.app.Usercalws.project=caldav 463 org.bedework.app.Usercalws.sou.dir=server 464 org.bedework.app.Usercalws.interface.jar=bw-caldav 465 466 org.bedework.app.Usercalws.web.xml=war/WEB-INF/userws-web.xml 467 org.bedework.app.Usercalws.tomcat.context.xml=war/META-INF/usercontext.xml 468 org.bedework.app.Usercalws.war.name=ucalws 469 org.bedework.app.Usercalws.context.root=/ucalws 470 # Set for jboss 471 #org.bedework.app.Usercalws.virtual.host= 472 473 org.bedework.app.Usercalws.security.domain=bedeworkdemo 474 org.bedework.app.Usercalws.security.prefix=demo 475 org.bedework.app.Usercalws.transport.guarantee=NONE 476 477 org.bedework.app.Usercalws.description=Bedework user calws server. 478 org.bedework.app.Usercalws.display.name=Bedework Usercalws 479 org.bedework.app.Usercalws.name=DemoUsrcalws 480 org.bedework.app.Usercalws.deploy.dir=${org.bedework.appserver.deploy.dir} 481 org.bedework.app.Usercalws.logprefix=Usercalws 482 483 # 484 # -------------------------------------------------------------------- 485 # 431 486 # CalDAV test 432 487 # … … 534 589 org.bedework.app.iosched.project=calendarapi 535 590 org.bedework.app.iosched.sou.dir= 591 org.bedework.app.iosched.in.ear=true 536 592 org.bedework.app.iosched.shellscr.name=bwrun 537 593 org.bedework.app.iosched.batscr.name=bwrun.bat … … 539 595 org.bedework.app.iosched.description=Bedework In/outbox scheduler application 540 596 541 597 # 598 # -------------------------------------------------------------------- 599 # 600 # Public Carddav Server 601 # 602 org.bedework.app.pubcarddav.project=carddav 603 org.bedework.app.pubcarddav.sou.dir=server 604 605 org.bedework.app.pubcarddav.web.xml=war/WEB-INF/publicweb.xml 606 org.bedework.app.pubcarddav.war.name=pubcarddav 607 org.bedework.app.pubcarddav.context.root=/pubcarddav 608 # Set for jboss 609 #org.bedework.app.pubcarddav.virtual.host=calendars.rpi.edu 610 611 org.bedework.app.pubcarddav.description=Bedework public carddav server. 612 org.bedework.app.pubcarddav.display.name=Bedework public carddav 613 org.bedework.app.pubcarddav.name=Demopubcarddav 614 org.bedework.app.pubcarddav.deploy.dir=${org.bedework.appserver.deploy.dir} 615 org.bedework.app.pubcarddav.logprefix=pubcarddav 616 617 # 618 # -------------------------------------------------------------------- 619 # 620 # Personal Carddav Server 621 # 622 org.bedework.app.usercarddav.project=carddav 623 org.bedework.app.usercarddav.sou.dir=server 624 625 org.bedework.app.usercarddav.web.xml=war/WEB-INF/userweb.xml 626 org.bedework.app.usercarddav.war.name=ucarddav 627 org.bedework.app.usercarddav.context.root=/ucarddav 628 # Set for jboss 629 #org.bedework.app.usercarddav.virtual.host=events.rpi.edu 630 631 org.bedework.app.usercarddav.security.domain=bedeworkdemo 632 org.bedework.app.usercarddav.security.prefix=demo 633 org.bedework.app.usercarddav.transport.guarantee=NONE 634 635 org.bedework.app.usercarddav.description=Bedework user carddav server. 636 org.bedework.app.usercarddav.display.name=Bedework usercarddav 637 org.bedework.app.usercarddav.name=DemoUsrcarddav 638 org.bedework.app.usercarddav.deploy.dir=${org.bedework.appserver.deploy.dir} 639 org.bedework.app.usercarddav.logprefix=usercarddav 640 releases/bedework-3.7/config/bwbuild/jboss-mysql/log4j.xml
r3097 r3169 386 386 </category> 387 387 388 <!-- 388 389 <category name="org.bedework.calsvc.CalSvc$SvcSimpleFilterParser"> 389 390 <priority value="${org.bedework.loglevel.exprfilters}"/> … … 398 399 </category> 399 400 400 <category name="org.bedework.calcore.AccessUtil">401 <priority value="INFO"/>402 </category>403 404 401 <category name="org.bedework.client.FilterBuilder"> 405 402 <priority value="${org.bedework.loglevel.exprfilters}"/> 403 </category> 404 --> 405 <category name="org.bedework.calsvc.CalSvc$SvcSimpleFilterParser"> 406 <priority value="INFO"/> 407 </category> 408 409 <category name="org.bedework.calsvc.client.FilterBuilder"> 410 <priority value="INFO"/> 411 </category> 412 413 <category name="org.hibernate.tool.hbm2ddl.SchemaExport"> 414 <priority value="INFO"/> 415 </category> 416 417 <category name="org.bedework.client.FilterBuilder"> 418 <priority value="INFO"/> 419 </category> 420 421 <category name="org.bedework.calcore.AccessUtil"> 422 <priority value="INFO"/> 406 423 </category> 407 424 releases/bedework-3.7/config/bwbuild/jboss-postgresql/build.properties
r3104 r3169 28 28 29 29 org.bedework.config.sysevents.properties=${env.BEDEWORK_CONFIG}/sysevents.properties 30 31 org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml32 33 #org.bedework.exsynch.options=${env.BEDEWORK_CONFIG}/exsynch.options.xml34 releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml
r3104 r3169 1 <?xml version="1.0"?> 2 1 3 <!-- This provides run time options for each of the configured applications. 2 4 --> … … 68 70 </caladdrPrefixes> 69 71 --> 72 73 <!-- =============================================================== 74 CardDAV directory handlers 75 =============================================================== --> 76 77 <dirhandlers> 78 <!-- handle the principal hierarchy. 79 This could be a read-only interface if we don't intend to allow 80 modification of the enterprise directory. 81 82 However, we may need to merge in subsidiary information to handle 83 principal properties. That may mean maintaining a shadow 84 principal hierarchy in the local server. 85 86 Each element name below must be unique. 87 --> 88 <principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 89 <pathPrefix>/principals</pathPrefix> 90 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 91 92 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 93 <providerUrl>ldap://localhost:10389/</providerUrl> 94 <baseDn>dc=bedework, dc=org</baseDn> 95 96 <queryLimit>1000</queryLimit> 97 98 <!-- We need to get operational attributes from the directory. 99 This requires us to explicitly name all attributes on fetch. 100 This element allows us to name EXTRA attributes from the default 101 list provided by the implementation. 102 --> 103 <attrIds></attrIds> 104 105 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 106 <addressbookIdAttr>ou</addressbookIdAttr> 107 108 <authDn>uid=admin,ou=system</authDn> 109 <authPw>secret</authPw> 110 111 <debug>true</debug> 112 </principal-dirHandler> 113 114 <user-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 115 <pathPrefix>/principals/users</pathPrefix> 116 <addressBook>true</addressBook> 117 118 <!-- The cardPathPrefix is used to manufacture a path to a card for 119 the principal. If it is set we take the path 120 121 <principal-root>/<account> 122 123 and transform it to 124 125 <cardPathPrefix>/<account>.vcf 126 127 If it is not set we try the cardPathPrefixes supplied globally. 128 If they are not supplied we don't give any path. The client will 129 have to fall back to a query. 130 --> 131 <cardPathPrefix>/public/people</cardPathPrefix> 132 133 <cardPathPrefixes>/public/people,loc_:/public/locations</cardPathPrefixes> 134 135 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 136 137 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 138 <providerUrl>ldap://localhost:10389/</providerUrl> 139 <baseDn>ou=accounts,dc=bedework,dc=org</baseDn> 140 141 <queryLimit>1000</queryLimit> 142 143 <attrIds></attrIds> 144 145 <cardKind>individual</cardKind> 146 147 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 148 <addressbookIdAttr>ou</addressbookIdAttr> 149 150 <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass> 151 <addressbookEntryIdAttr>uid</addressbookEntryIdAttr> 152 153 <principalIdAttr>uid</principalIdAttr> 154 155 <authDn>uid=admin,ou=system</authDn> 156 <authPw>secret</authPw> 157 158 <debug>true</debug> 159 </user-principal-dirHandler> 160 161 <group-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 162 <pathPrefix>/principals/groups</pathPrefix> 163 <addressBook>true</addressBook> 164 165 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 166 167 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 168 <providerUrl>ldap://localhost:10389/</providerUrl> 169 170 <baseDn>ou=groups,dc=bedework,dc=org</baseDn> 171 172 <queryLimit>1000</queryLimit> 173 174 <attrIds></attrIds> 175 176 <cardKind>group</cardKind> 177 178 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 179 <addressbookIdAttr>ou</addressbookIdAttr> 180 181 <addressbookEntryObjectClass>groupOfUniqueNames</addressbookEntryObjectClass> 182 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 183 184 <principalIdAttr>cn</principalIdAttr> 185 186 <authDn>uid=admin,ou=system</authDn> 187 <authPw>secret</authPw> 188 189 <debug>true</debug> 190 </group-principal-dirHandler> 191 192 <location-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 193 <pathPrefix>/principals/locations</pathPrefix> 194 <addressBook>true</addressBook> 195 <cardPathPrefix>/public/locations</cardPathPrefix> 196 197 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 198 199 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 200 <providerUrl>ldap://localhost:10389/</providerUrl> 201 202 <baseDn>ou=locations,dc=bedework,dc=org</baseDn> 203 204 <queryLimit>1000</queryLimit> 205 206 <attrIds></attrIds> 207 208 <cardKind>location</cardKind> 209 210 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 211 <addressbookIdAttr>ou</addressbookIdAttr> 212 213 <addressbookEntryObjectClass>groupOfUniqueNames</addressbookEntryObjectClass> 214 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 215 216 <principalIdAttr>cn</principalIdAttr> 217 218 <authDn>uid=admin,ou=system</authDn> 219 <authPw>secret</authPw> 220 221 <debug>true</debug> 222 </location-principal-dirHandler> 223 224 <!-- handle the public (enterprise) people address book hierarchy --> 225 <public-people-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 226 <pathPrefix>/public/people</pathPrefix> 227 228 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className> 229 230 <!-- manufacture an owner for public entities --> 231 <ownerHref>/principals/users/admin</ownerHref> 232 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 233 <providerUrl>ldap://localhost:10389/</providerUrl> 234 <baseDn>ou=people,ou=public,dc=bedework,dc=org</baseDn> 235 <queryLimit>1000</queryLimit> 236 237 <attrIds></attrIds> 238 239 <folderObjectClass>organizationalUnit</folderObjectClass> 240 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 241 <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass> 242 <folderIdAttr>ou</folderIdAttr> 243 <addressbookIdAttr>ou</addressbookIdAttr> 244 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 245 246 <authDn>uid=admin,ou=system</authDn> 247 <authPw>secret</authPw> 248 <debug>true</debug> 249 </public-people-dirHandler> 250 251 252 <!-- handle the user address book hierarchy --> 253 254 <user-dirHandler classname="org.bedework.carddav.util.DbDirHandlerConfig" > 255 <pathPrefix>/user</pathPrefix> 256 257 <className>org.bedework.carddav.server.dirHandlers.db.DbAddrBookDirHandler</className> 258 259 <queryLimit>1000</queryLimit> <!-- unimplemented --> 260 261 <!-- This is the access set at the root. I'll do this as XML soon --> 262 <rootAccess>WONyA WANyFyS </rootAccess> 263 264 <!-- This is the owner of the user root and user home --> 265 <rootOwner>/principals/users/root</rootOwner> 266 267 <debug>true</debug> 268 </user-dirHandler> 269 270 <!-- handle the user address book hierarchy 271 How it might be done with ldap 272 <user-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 273 <pathPrefix>/user</pathPrefix> 274 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className> 275 276 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 277 <providerUrl>ldap://localhost:10389/</providerUrl> 278 279 <baseDn>ou=users,ou=addrbooks,dc=bedework,dc=org</baseDn> 280 281 <queryLimit>1000</queryLimit> 282 283 <attrIds></attrIds> 284 285 <folderObjectClass>organizationalUnit</folderObjectClass> 286 <folderIdAttr>ou</folderIdAttr> 287 288 <addressbookObjectClass>addressBook</addressbookObjectClass> 289 <addressbookIdAttr>ou</addressbookIdAttr> 290 291 <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass> 292 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 293 294 <authDn>uid=admin,ou=system</authDn> 295 <authPw>secret</authPw> 296 <debug>true</debug> 297 </user-dirHandler> 298 --> 299 300 <public-locations-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 301 <pathPrefix>/public/locations</pathPrefix> 302 303 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className> 304 305 <!-- manufacture an owner for public entities --> 306 <ownerHref>/principals/users/admin</ownerHref> 307 308 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 309 <providerUrl>ldap://localhost:10389/</providerUrl> 310 <baseDn>ou=locations,ou=public,dc=bedework,dc=org</baseDn> 311 312 <queryLimit>1000</queryLimit> 313 314 <attrIds></attrIds> 315 316 <cardKind>location</cardKind> 317 318 <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 319 <addressbookIdAttr>ou</addressbookIdAttr> 320 321 <addressbookEntryObjectClass>CalendarResource</addressbookEntryObjectClass> 322 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 323 324 <principalIdAttr>calcaladruri</principalIdAttr> 325 326 <authDn>uid=admin,ou=system</authDn> 327 <authPw>secret</authPw> 328 329 <debug>true</debug> 330 </public-locations-dirHandler> 331 332 <!-- handle the public (enterprise) address book hierarchy --> 333 <public-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 334 <pathPrefix>/public</pathPrefix> 335 <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className> 336 337 <!-- manufacture an owner for public entities --> 338 <ownerHref>/principals/users/admin</ownerHref> 339 340 <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 341 <providerUrl>ldap://localhost:10389/</providerUrl> 342 343 <baseDn>ou=public,dc=bedework,dc=org</baseDn> 344 345 <queryLimit>1000</queryLimit> 346 347 <attrIds></attrIds> 348 349 <folderObjectClass>organizationalUnit</folderObjectClass> 350 <addressbookObjectClass>addressBook</addressbookObjectClass> 351 <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass> 352 353 <folderIdAttr>ou</folderIdAttr> 354 <addressbookIdAttr>ou</addressbookIdAttr> 355 <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 356 357 <authDn>uid=admin,ou=system</authDn> 358 <authPw>secret</authPw> 359 <debug>true</debug> 360 </public-dirHandler> 361 </dirhandlers> 70 362 363 <!-- =============================================================== 364 Calendar system modules 365 =============================================================== --> 366 71 367 <module> 72 368 <!-- A dummy module with no directory. --> … … 176 472 177 473 <app> 178 <!-- =============================================================== ===474 <!-- =============================================================== 179 475 Timezones server 180 =============================================================== ===-->476 =============================================================== --> 181 477 <tzsvr classname="org.bedework.timezones.common.TzsvrConfig"> 182 478 <appType>tzsvr</appType> … … 193 489 </tzsvr> 194 490 195 <!-- =============================================================== ===491 <!-- =============================================================== 196 492 Config web client 197 =============================================================== ===-->493 =============================================================== --> 198 494 <bwconfig classname="org.bedework.calfacade.configs.ConfigCommon"> 199 495 <appType>webconfig</appType> … … 202 498 </bwconfig> 203 499 204 <!-- =============================================================== ===500 <!-- =============================================================== 205 501 Admin web client CalAdmin 206 =============================================================== ===-->502 =============================================================== --> 207 503 <CalAdmin classname="org.bedework.calfacade.configs.AdminConfig"> 208 504 <autoCreateContacts>false</autoCreateContacts> … … 426 722 </UserCal> 427 723 428 <!-- =============================================================== ===724 <!-- =============================================================== 429 725 User CalDAV server UserCalDAV 430 =============================================================== ===-->726 =============================================================== --> 431 727 <Usercaldav classname="org.bedework.caldav.util.CalDAVConfig"> 432 728 <appType>usercaldav</appType> … … 619 915 <remoteKeepAliveInterval>60</remoteKeepAliveInterval> 620 916 </Exsynch> 917 918 <!-- =============================================================== 919 User CardDAV server usercarddav 920 =============================================================== --> 921 <usercarddav classname="org.bedework.carddav.util.CardDAVConfig" > 922 <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl> 923 924 <webaddrServiceURI>/find</webaddrServiceURI> 925 <webaddrServicePropertiesList>fn,email,note,org</webaddrServicePropertiesList> 926 <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook> 927 928 <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed> 929 930 <defaultAddressbook>addressbook</defaultAddressbook> 931 932 <!-- This will act as the root for the file system --> 933 <addressBookHandlerPrefix>/user</addressBookHandlerPrefix> 934 935 <!-- Needed for access calculations --> 936 <userHomeRoot>/user</userHomeRoot> 937 938 <principalRoot>/principals</principalRoot> 939 <userPrincipalRoot>/principals/users</userPrincipalRoot> 940 <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 941 <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 942 <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 943 <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 944 <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 945 </usercarddav> 946 947 <!-- =============================================================== 948 Public CardDAV server pubcarddav 949 =============================================================== --> 950 <pubcarddav classname="org.bedework.carddav.util.CardDAVConfig" > 951 <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl> 952 953 <webaddrServiceURI>/find</webaddrServiceURI> 954 <webaddrServicePropertiesList>fn,note,org</webaddrServicePropertiesList> 955 <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook> 956 957 <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed> 958 959 <defaultAddressbook>addressbook</defaultAddressbook> 960 961 <addressBookHandlerPrefix>/public</addressBookHandlerPrefix> 962 963 <!-- Needed for access calculations --> 964 <userHomeRoot>/user</userHomeRoot> 965 966 <principalRoot>/principals</principalRoot> 967 <userPrincipalRoot>/principals/users</userPrincipalRoot> 968 <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 969 <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 970 <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 971 <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 972 <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 973 </pubcarddav> 621 974 </app> 622 975 </bedework> releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.properties
r3147 r3169 197 197 org.bedework.app.tzsvr.context.root=/tzsvr 198 198 # Set for jboss 199 #org.bedework.app.tzsvr.virtual.host= 199 #org.bedework.app.tzsvr.virtual.host=my.host1,my.host.2 200 200 201 201 org.bedework.app.tzsvr.description=Bedework timezones server. … … 596 596 org.bedework.app.iosched.description=Bedework In/outbox scheduler application 597 597 598 598 # 599 # -------------------------------------------------------------------- 600 # 601 # Public Carddav Server 602 # 603 org.bedework.app.pubcarddav.project=carddav 604 org.bedework.app.pubcarddav.sou.dir=server 605 606 org.bedework.app.pubcarddav.web.xml=war/WEB-INF/publicweb.xml 607 org.bedework.app.pubcarddav.war.name=pubcarddav 608 org.bedework.app.pubcarddav.context.root=/pubcarddav 609 # Set for jboss 610 #org.bedework.app.pubcarddav.virtual.host=calendars.rpi.edu 611 612 org.bedework.app.pubcarddav.description=Bedework public carddav server. 613 org.bedework.app.pubcarddav.display.name=Bedework public carddav 614 org.bedework.app.pubcarddav.name=Demopubcarddav 615 org.bedework.app.pubcarddav.deploy.dir=${org.bedework.appserver.deploy.dir} 616 org.bedework.app.pubcarddav.logprefix=pubcarddav 617 618 # 619 # -------------------------------------------------------------------- 620 # 621 # Personal Carddav Server 622 # 623 org.bedework.app.usercarddav.project=carddav 624 org.bedework.app.usercarddav.sou.dir=server 625 626 org.bedework.app.usercarddav.web.xml=war/WEB-INF/userweb.xml 627 org.bedework.app.usercarddav.war.name=ucarddav 628 org.bedework.app.usercarddav.context.root=/ucarddav 629 # Set for jboss 630 #org.bedework.app.usercarddav.virtual.host=events.rpi.edu 631 632 org.bedework.app.usercarddav.security.domain=bedeworkdemo 633 org.bedework.app.usercarddav.security.prefix=demo 634 org.bedework.app.usercarddav.transport.guarantee=NONE 635 636 org.bedework.app.usercarddav.description=Bedework user carddav server. 637 org.bedework.app.usercarddav.display.name=Bedework usercarddav 638 org.bedework.app.usercarddav.name=DemoUsrcarddav 639 org.bedework.app.usercarddav.deploy.dir=${org.bedework.appserver.deploy.dir} 640 org.bedework.app.usercarddav.logprefix=usercarddav 641 releases/bedework-3.7/config/bwbuild/jboss-postgresql/log4j.xml
r3097 r3169 386 386 </category> 387 387 388 <!-- 388 389 <category name="org.bedework.calsvc.CalSvc$SvcSimpleFilterParser"> 389 390 <priority value="${org.bedework.loglevel.exprfilters}"/> … … 398 399 </category> 399 400 400 <category name="org.bedework.calcore.AccessUtil">401 <priority value="INFO"/>402 </category>403 404 401 <category name="org.bedework.client.FilterBuilder"> 405 402 <priority value="${org.bedework.loglevel.exprfilters}"/> 403 </category> 404 --> 405 <category name="org.bedework.calsvc.CalSvc$SvcSimpleFilterParser"> 406 <priority value="INFO"/> 407 </category> 408 409 <category name="org.bedework.calsvc.client.FilterBuilder"> 410 <priority value="INFO"/> 411 </category> 412 413 <category name="org.hibernate.tool.hbm2ddl.SchemaExport"> 414 <priority value="INFO"/> 415 </category> 416 417 <category name="org.bedework.client.FilterBuilder"> 418 <priority value="INFO"/> 419 </category> 420 421 <category name="org.bedework.calcore.AccessUtil"> 422 <priority value="INFO"/> 406 423 </category> 407 424 releases/bedework-3.7/deployment/build.xml
r3147 r3169 101 101 value="${org.bedework.global.jboss.db.datasource.jndiname}" /> 102 102 103 <!-- 103 104 <property name="org.bedework.options.file" 104 105 value="${org.bedework.config.options}" /> 106 --> 105 107 106 108 <!-- Common resources directory --> releases/bedework-3.7/deployutil/src/org/bedework/deployment/ForEachAppTask.java
r2624 r3169 27 27 28 28 import org.apache.tools.ant.BuildException; 29 import org.apache.tools.ant.PropertyHelper;30 import org.apache.tools.ant.taskdefs.Sequential;31 29 32 30 import java.util.Iterator; … … 47 45 * 48 46 * <p>Generated properties are all prefixed by the prefix attribute and are:<ul> 49 * <li>project.path Path to project</li> 50 * <li>name name of the application</li> 47 * <li>name name of the application - from the list of names</li> 48 * <li>projectName Name of the project - from the "X.project" property</li> 49 * <li>project.path Path to project - value of the property projectPrefix + projectName</li> 50 * <li>app.sou Path to source for application - from the "X.sou.dir" property</li> 51 51 * </ul> 52 * 53 * <p> 54 * if appPrefix="org.bedework.app" and project name is myproject we expect a 55 * bunch of properties of the form "org.bedework.app.myapp.xxx". 56 * </p> 57 * 58 * <p> 59 * If projectPrefix="org.bedework.project" and org.bedework.app.myapp.project=myproject 60 * we expect a property with the name "org.bedework.project.myproject" which 61 * provides the location of the project. This allows us to locate internal 62 * project resources. 63 * </p> 52 64 * 53 65 * <p>Body is ant … … 55 67 * @author douglm @ rpi.edu 56 68 */ 57 public class ForEachAppTask extends Sequential { 58 private static final String bedeworkHomeProperty = "org.bedework.project.bedework"; 59 69 public class ForEachAppTask extends ForAppTask { 60 70 private String names; 61 62 private String prefix;63 64 private String appPrefix;65 66 private String projectPrefix;67 71 68 72 /** Set the names … … 72 76 public void setNames(final String val) { 73 77 names = val; 74 }75 76 /** Set the generated property prefix77 *78 * @param val String79 */80 public void setPrefix(final String val) {81 prefix = val;82 }83 84 /** Set the applications property prefix85 *86 * @param val String87 */88 public void setAppPrefix(final String val) {89 appPrefix = val;90 }91 92 /** Set the project locations property prefix93 *94 * @param val String95 */96 public void setProjectPrefix(final String val) {97 projectPrefix = val;98 78 } 99 79 … … 109 89 } 110 90 111 if (prefix == null) {112 throw new BuildException("Must supply property name prefix.");113 }114 115 if (!prefix.endsWith(".")) {116 prefix += ".";117 }118 119 if (!appPrefix.endsWith(".")) {120 appPrefix += ".";121 }122 123 if (!projectPrefix.endsWith(".")) {124 projectPrefix += ".";125 }126 127 PropertyHelper props = PropertyHelper.getPropertyHelper(getProject());128 129 String bedeworkHome = (String)props.getProperty(null, bedeworkHomeProperty);130 131 if (bedeworkHome == null) {132 throw new BuildException("Must supply property " + bedeworkHomeProperty);133 }134 135 91 Iterator nit = nameList.iterator(); 136 92 … … 138 94 String name = (String)nit.next(); 139 95 140 String appProjectProperty = appPrefix + name + ".project"; 141 String project = (String)props.getProperty(null, appProjectProperty); 142 143 if (project == null) { 144 throw new BuildException("Property " + appProjectProperty + 145 " is undefined"); 146 } 147 148 /* Build full project property from project name and get value */ 149 150 String projectProperty = projectPrefix + project; 151 String projectPath = (String)props.getProperty(null, projectProperty); 152 153 if (projectPath == null) { 154 throw new BuildException("Property " + projectProperty + 155 " is undefined"); 156 } 157 158 String appSouProperty = appPrefix + name + ".sou.dir"; 159 String appSou = (String)props.getProperty(null, appSouProperty); 160 161 if (appSou == null) { 162 throw new BuildException("Property " + appSouProperty + 163 " is undefined"); 164 } 165 166 if (appSou.length() == 0) { 167 appSou = projectPath; 168 } else { 169 appSou = projectPath + "/" + appSou; 170 } 171 172 props.setProperty(null, prefix + "name", name, false); 173 props.setProperty(null, prefix + "projectName", project, false); 174 props.setProperty(null, prefix + "project.path", projectPath, false); 175 props.setProperty(null, prefix + "app.sou", appSou, false); 176 177 super.execute(); 96 doProps(name); 178 97 } 179 98 } catch (BuildException be) { releases/bedework-3.7/deployutil/src/org/bedework/deployment/MakeLangXsl.java
r2624 r3169 296 296 } 297 297 298 @SuppressWarnings("unchecked") 298 299 private void checkResources(final List<String> fnames) throws BuildException { 299 300 List<TreeSet<String>> propNamesList = new LinkedList<TreeSet<String>>();
