Changeset 3014

Timestamp:

10/21/10 16:29:50

Author:

bleibson

Message:

Jboss is the new default, so make it so.

Files:

• trunk/config/bwbuild/default/activemq-broker-config.xml (added)
• trunk/config/bwbuild/default/activemq-jms-ds.xml (added)
• trunk/config/bwbuild/default/activemq-ra.xml (added)
• trunk/config/bwbuild/default/activemq.xml (deleted)
• trunk/config/bwbuild/default/application.sysevents.properties (added)
• trunk/config/bwbuild/default/bedework-card-ds.xml (added)
• trunk/config/bwbuild/default/bedework-ds.xml (added)
• trunk/config/bwbuild/default/build.properties (modified) (1 diff)
• trunk/config/bwbuild/default/cal.options.xml (modified) (4 diffs)
• trunk/config/bwbuild/default/cal.properties (modified) (28 diffs)
• trunk/config/bwbuild/default/carddav.options.xml (modified) (8 diffs)
• trunk/config/bwbuild/default/context.xml (deleted)
• trunk/config/bwbuild/default/sysevents.properties (modified) (2 diffs)

trunk/config/bwbuild/default/build.properties

@@ -7 +7 @@
-# defined later in the build process.
-# The order of loading is:
-
+
+
-#   <various other distributed properties>
-#
-
-
-
+
-#
-

trunk/config/bwbuild/default/cal.options.xml

@@ -30 +30 @@
-
-        <!-- CardDAV server locations -->
-
-
+
+
+
+
+
+
+
-
-        <!-- Timezone server locations -->
-        <timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
-
- 
+
-          <principalRoot>/principals</principalRoot>
-          <userPrincipalRoot>/principals/users</userPrincipalRoot>
@@ -47 +52 @@
-        </systemRoots>
-
+        <!-- To enable mapping of calendar addresses e.g. mailto:fred@example.org
+             on to principals we need to either do a directory lookup or have
+             some sort of pattern map. 
+             
+             Setting a caladdr prefix enables pattern mapping. By default 
+             calendar addresses are users -->
+             
+          <!-- 
+        <caladdrPrefixes classname="org.bedework.calfacade.configs.CalAddrPrefixes">
+          <location>loc_</location>
+        </caladdrPrefixes>     
+           -->
+        
-        <module>
-          <!-- A dummy module with no directory. -->
@@ -101 +119 @@
-
-          <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
-QUICKSTART
-QUICKSTART
+DATA
+DATA
-
-            <debug>true</debug>
@@ -511 +529 @@
-
-        <!-- ==================================================================
+                          System events monitor program
+             ================================================================== -->
+        <monitor classname="org.bedework.calfacade.configs.BwCrawlerConfig">
+          <debug>true</debug>
+          <appType>monitor</appType>
+          <guestMode>true</guestMode>
+          <debugEntity>false</debugEntity>
+        </monitor>
+
+        <!-- ==================================================================
+                          System key generator
+             ================================================================== -->
+        <genkeys classname="org.bedework.calfacade.configs.BwCrawlerConfig">
+          <debug>true</debug>
+          <appType>genkeys</appType>
+          <guestMode>true</guestMode>
+          <debugEntity>false</debugEntity>
+        </genkeys>
+
+        <!-- ==================================================================
-                          In/outbox scheduler program
-             ================================================================== -->

trunk/config/bwbuild/default/cal.properties

@@ -18 +18 @@
-# Define the names of the applications we want to build
-org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
-dumpres,indexer
-
+indexer,dumpres
+,monitor,genkeys
-
-#
@@ -30 +30 @@
-# 'environment' options used globally by the system.
-#
-
-
-
-
-
+
+
+
+
+
+
+
-org.bedework.global.jdbcid=sa
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-# Hibernate caching parameters
@@ -44 +57 @@
-# Specify the platform we are building for. buildwar.xml will import the file
-# build/platforms/<platform>War.xml
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#
-# ------------------------------------------------------------------------
@@ -64 +96 @@
-org.bedework.jquery.dir=jquery
-
+# ------------------------------------------------------------------------
+# Extra jars
+# ------------------------------------------------------------------------
+#
-# A place to put extra jars and files, e.g. jdbc drivers.
-# This can be directed at any local directory
-#
-
-
+
+
+
+
+
+
-
-# ------------------------------------------------------------------------
@@ -75 +115 @@
-
-#  where the application server lives
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-#  where most library files used by all applications go
-
+
+
+
+
+
-
-# where 'endorsed' library files go.  These classes override anything
-# the JVM has. This is particularly important for things like Xalan,
-# etc., which can break the application if you choose the wrong version
-
+
+
+
+
-
-# where things like log4j config files go
-
-
-
-
-
-
-
+
-
-#  Set to yes if you want your log4j.xml overwritten
-org.bedework.deploy.log4j.config=no
+#
+# If set to true or yes will copy in the bedework db datasource def bedework-ds.xml
+org.bedework.global.copy.bedeworkds.config=yes
+#
+# If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml
+org.bedework.global.copy.bedeworkcardds.config=yes
+
+# ------------------------------------------------------------------------
+# ActiveMQ defs
+# ------------------------------------------------------------------------
+
+org.bedework.global.activemq.dir=${org.bedework.appserver.deploy.dir}/activemq-rar-5.3.0.rar
+#
+# If set to true or yes will copy in the activemq configuration into the rar
+org.bedework.global.copy.activemq.config=yes
+
-#
-# ------------------------------------------------------------------------
@@ -128 +191 @@
-#
-
+org.bedework.app.tzsvr.war.only=yes
-org.bedework.app.tzsvr.project=bwtzsvr
-org.bedework.app.tzsvr.sou.dir=tzsvr
@@ -138 +202 @@
-org.bedework.app.tzsvr.display.name=Bedework timezones server.
-org.bedework.app.tzsvr.name=tzsvr
-/webapps
+${org.bedework.appserver.deploy.dir}
-org.bedework.app.tzsvr.logprefix=Tzsvr
-
@@ -161 +225 @@
-org.bedework.app.bwconfig.war.name=bwconfig
-org.bedework.app.bwconfig.context.root=/bwconfig
-/webapps/ROOT
-/webapps
+${org.bedework.server.resource.root.dir}
+${org.bedework.appserver.deploy.dir}
-org.bedework.app.bwconfig.description=Bedework properties config application
-org.bedework.app.bwconfig.display.name=Bedework Config
@@ -178 +242 @@
-#org.bedework.app.CalAdmin.portlet.name=CalAdmin
-
-${env.BEDEWORK_CONFIG}
+war/META-INF
-
-org.bedework.app.CalAdmin.war.name=caladmin
@@ -184 +248 @@
-# Set for jboss
-#org.bedework.app.CalAdmin.virtual.host=
-/webapps/ROOT
-/webapps
-
-
+${org.bedework.server.resource.root.dir}
+${org.bedework.appserver.deploy.dir}
+
+bedework
-org.bedework.app.CalAdmin.security.prefix=demo
-org.bedework.app.CalAdmin.transport.guarantee=NONE
@@ -204 +268 @@
-org.bedework.app.EventSubmit.default.contenttype=text/xml
-org.bedework.app.EventSubmit.web.xml=war/WEB-INF/web.xml
-${env.BEDEWORK_CONFIG}
+war/META-INF
-#org.bedework.app.EventSubmit.portlet.name=EventSubmit
-
@@ -211 +275 @@
-# Set for jboss
-#org.bedework.app.EventSubmit.virtual.host=
-/webapps/ROOT
-/webapps
-
-
+${org.bedework.server.resource.root.dir}
+${org.bedework.appserver.deploy.dir}
+
+bedework
-org.bedework.app.EventSubmit.security.prefix=demo
-org.bedework.app.EventSubmit.transport.guarantee=NONE
@@ -231 +295 @@
-org.bedework.app.Events.default.contenttype=text/xml
-org.bedework.app.Events.web.xml=war/WEB-INF/publicweb.xml
-${env.BEDEWORK_CONFIG}/
+war/META-INF/public
-#org.bedework.app.Events.portlet.name=PublicCal
-
@@ -238 +302 @@
-# Set for jboss
-#org.bedework.app.Events.virtual.host=
-/webapps/ROOT
-/webapps
+${org.bedework.server.resource.root.dir}
+${org.bedework.appserver.deploy.dir}
-org.bedework.app.Events.cal.suite=MainCampus
-
-org.bedework.app.Events.description=Struts based XML version of the Bedework calendar client. It may have many skins, determined by the XSLT.
- - Duke/Yale Themed Suite
+
-org.bedework.app.Events.name=DemoCal
-
@@ -263 +327 @@
-# Set for jboss
-#org.bedework.app.Feeder.virtual.host=
-/webapps/ROOT
-/webapps
+${org.bedework.server.resource.root.dir}
+${org.bedework.appserver.deploy.dir}
-org.bedework.app.Feeder.cal.suite=MainCampus
-
@@ -280 +344 @@
-org.bedework.app.SoEDept.default.contenttype=text/xml
-org.bedework.app.SoEDept.web.xml=war/WEB-INF/publicweb.xml
-${env.BEDEWORK_CONFIG}/
+war/META-INF/public
-#org.bedework.app.SoEDept.portlet.name=SoEDept
-
@@ -287 +351 @@
-# Set for jboss
-#org.bedework.app.SoEDept.virtual.host=
-/webapps/ROOT
-/webapps
+${org.bedework.server.resource.root.dir}
+${org.bedework.appserver.deploy.dir}
-org.bedework.app.SoEDept.cal.suite=SoEDepartmental
-
@@ -304 +368 @@
-org.bedework.app.UserCal.default.contenttype=text/xml
-org.bedework.app.UserCal.web.xml=war/WEB-INF/userweb.xml
-${env.BEDEWORK_CONFIG}/
+war/META-INF/user
-#org.bedework.app.UserCal.portlet.name=UserCal
-
@@ -311 +375 @@
-# Set for jboss
-#org.bedework.app.UserCal.virtual.host=
-/webapps/ROOT
-/webapps
-
-
+${org.bedework.server.resource.root.dir}
+${org.bedework.appserver.deploy.dir}
+
+bedework
-org.bedework.app.UserCal.security.prefix=demo
-org.bedework.app.UserCal.transport.guarantee=NONE
@@ -332 +396 @@
-
-org.bedework.app.Pubcaldav.web.xml=war/WEB-INF/publicweb.xml
-${env.BEDEWORK_CONFIG}/
+war/META-INF/public
-org.bedework.app.Pubcaldav.war.name=pubcaldav
-org.bedework.app.Pubcaldav.context.root=/pubcaldav
@@ -341 +405 @@
-org.bedework.app.Pubcaldav.display.name=Bedework public caldav
-org.bedework.app.Pubcaldav.name=DemoPubcaldav
-/webapps
+${org.bedework.appserver.deploy.dir}
-org.bedework.app.Pubcaldav.logprefix=PubCalDav
-
@@ -354 +418 @@
-
-org.bedework.app.Usercaldav.web.xml=war/WEB-INF/userweb.xml
-${env.BEDEWORK_CONFIG}/
+war/META-INF/user
-org.bedework.app.Usercaldav.war.name=ucaldav
-org.bedework.app.Usercaldav.context.root=/ucaldav
@@ -360 +424 @@
-#org.bedework.app.Usercaldav.virtual.host=
-
-
+bedework
-org.bedework.app.Usercaldav.security.prefix=demo
-org.bedework.app.Usercaldav.transport.guarantee=NONE
@@ -367 +431 @@
-org.bedework.app.Usercaldav.display.name=Bedework usercaldav
-org.bedework.app.Usercaldav.name=DemoUsrcaldav
-/webapps
+${org.bedework.appserver.deploy.dir}
-org.bedework.app.Usercaldav.logprefix=UserCalDav
-
@@ -376 +440 @@
-#
-
+org.bedework.app.caldavTest.runnable=yes
-org.bedework.app.caldavTest.project=caldavTest
-org.bedework.app.caldavTest.sou.dir=caldavTest
@@ -389 +454 @@
-#
-
+org.bedework.app.test.runnable=yes
-org.bedework.app.test.project=testsuite
-org.bedework.app.test.sou.dir=
@@ -442 +508 @@
-# --------------------------------------------------------------------
-#
+# Server monitor
+#
+
+org.bedework.app.monitor.project=calendarapi
+org.bedework.app.monitor.sou.dir=
+org.bedework.app.monitor.shellscr.name=bwrun
+org.bedework.app.monitor.batscr.name=bwrun.bat
+org.bedework.app.monitor.zip.name=monitor
+org.bedework.app.monitor.description=Bedework system events monitor application
+
+#
+# --------------------------------------------------------------------
+#
+# Key generator
+#
+
+org.bedework.app.genkeys.project=calendarapi
+org.bedework.app.genkeys.sou.dir=
+org.bedework.app.genkeys.shellscr.name=bwrun
+org.bedework.app.genkeys.batscr.name=bwrun.bat
+org.bedework.app.genkeys.zip.name=genkeys
+org.bedework.app.genkeys.description=Bedework system Key generator
+
+#
+# --------------------------------------------------------------------
+#
-# In/outbox scheduler
-#
@@ -452 +544 @@
-org.bedework.app.iosched.description=Bedework In/outbox scheduler application
-
+

trunk/config/bwbuild/default/carddav.options.xml

@@ -15 +15 @@
-               principal properties. That may mean maintaining a shadow
-               principal hierarchy in the local server.
+               
+               Each element name below must be unique.
-            -->
-          <principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
-            <pathPrefix>/principals</pathPrefix>
-
+ldap.
-
-            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
@@ -29 +31 @@
-               This requires us to explicitly name all attributes on fetch.
-               This element allows us to name EXTRA attributes from the default
-em
+me
-              -->
-            <attrIds></attrIds>
@@ -45 +47 @@
-            <pathPrefix>/principals/users</pathPrefix>
-            <addressBook>true</addressBook>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
@@ -76 +95 @@
-            <addressBook>true</addressBook>
-
-
+ldap.
-
-            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
@@ -102 +121 @@
-            <debug>true</debug>
-          </group-principal-dirHandler>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          <!-- handle the user address book hierarchy -->
+          
+          <user-dirHandler classname="org.bedework.carddav.util.DbDirHandlerConfig" >
+            <pathPrefix>/user</pathPrefix>
+            
+            <className>org.bedework.carddav.server.dirHandlers.db.DbAddrBookDirHandler</className>
+
+            <queryLimit>1000</queryLimit> <!-- unimplemented -->
+          
+            <!-- This is the access set at the root. I'll do this as XML soon -->
+            <rootAccess>WONyA WANyFyS </rootAccess>
+          
+            <!-- This is the owner of the user root and user home -->
+            <rootOwner>/principals/users/root</rootOwner>
+            
+            <debug>true</debug>
+          </user-dirHandler>
+
+          <!-- handle the user address book hierarchy
+               How it might be done with ldap 
-          <user-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
-            <pathPrefix>/user</pathPrefix>
-
+ldap.
-
-            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
@@ -130 +200 @@
-            <debug>true</debug>
-          </user-dirHandler>
+          -->
+ 
+          <public-locations-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/public/locations</pathPrefix>
+
+            <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className>
+
+            <!-- manufacture an owner for public entities -->
+            <ownerHref>/principals/users/admin</ownerHref>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+            <baseDn>ou=locations,ou=public,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <cardKind>location</cardKind>
+
+            <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <addressbookEntryObjectClass>CalendarResource</addressbookEntryObjectClass>
+            <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+            <principalIdAttr>calcaladruri</principalIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+
+            <debug>true</debug>
+          </public-locations-dirHandler>
-
-          <!-- handle the public (enterprise) address book hierarchy -->
-          <public-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
-            <pathPrefix>/public</pathPrefix>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-            <queryLimit>1000</queryLimit>
@@ -163 +269 @@
-        <usercarddav classname="org.bedework.carddav.util.CardDAVConfig" >
-          <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+          
-          <webaddrServiceURI>/find</webaddrServiceURI>
+          <webaddrServicePropertiesList>fn,email,note,org</webaddrServicePropertiesList>
-          <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
-
-          <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
-
-
-
+
+
+
-          <addressBookHandlerPrefix>/user</addressBookHandlerPrefix>
+          
+          <!-- Needed for access calculations -->
+          <userHomeRoot>/user</userHomeRoot>
-
-          <principalRoot>/principals</principalRoot>
@@ -183 +295 @@
-        <pubcarddav classname="org.bedework.carddav.util.CardDAVConfig" >
-          <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+          
-          <webaddrServiceURI>/find</webaddrServiceURI>
+          <webaddrServicePropertiesList>fn,note,org</webaddrServicePropertiesList>
-          <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
-
-          <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
-
--
+
-
-          <addressBookHandlerPrefix>/public</addressBookHandlerPrefix>
+          
+          <!-- Needed for access calculations -->
+          <userHomeRoot>/user</userHomeRoot>
-
-          <principalRoot>/principals</principalRoot>

trunk/config/bwbuild/default/sysevents.properties

@@ -2 +2 @@
-# activemq jndi.properties
-#
-
-
-
+
-
-# use the following property to configure the default connector
-java.naming.provider.url = tcp://localhost:61616?trace=true
+#java.naming.provider.url = vm://localhost?trace=true
-
-// Allows us to handle container differences
-
+
+
-
-
+activemq/
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-jms/Bedework
+activemq/Queue
-
-# register some queues in JNDI using the form
@@ -35 +35 @@
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-
-
-
-
-#
-# context.xml
-#  <Resource name="jms/BedeworkConnectionFactory"
-#            auth="Container"
-#            type="org.apache.activemq.ActiveMQConnectionFactory"
-#            description="JMS Connection Factory"
-#            factory="org.apache.activemq.jndi.JNDIReferenceFactory"
-#            brokerURL="tcp://localhost:61616?trace=true"
-#            brokerName="LocalActiveMQBroker"/>
-#
-#  <!-- ActiveMQ System events queue -->
-#  <Resource name="queue/sysevents"
-#            auth="Container"
-#            type="org.apache.activemq.command.ActiveMQQueue"
-#            description="Bedework crawler queue"
-#            factory="org.apache.activemq.jndi.JNDIReferenceFactory"
-#            physicalName="bedework.sysevents"/>
-#
-#  <!-- ActiveMQ System events log queue -->
-#  <Resource name="queue/syseventslog"
-#            auth="Container"
-#            type="org.apache.activemq.command.ActiveMQQueue"
-#            description="Bedework crawler queue"
-#            factory="org.apache.activemq.jndi.JNDIReferenceFactory"
-#            physicalName="bedework.sysevents.logger"/>
-#
-#  <!-- ActiveMQ index crawler notifications queue -->
-#  <Resource name="queue/crawler"
-#            auth="Container"
-#            type="org.apache.activemq.command.ActiveMQQueue"
-#            description="Bedework crawler queue"
-#            factory="org.apache.activemq.jndi.JNDIReferenceFactory"
-#            physicalName="bedework.crawler"/>