Changeset 2719

Timestamp:

01/27/10 13:40:56

Author:

douglm

Message:

Update the activemq configuration from files in the config directory.

Add feeder app to build

Files:

• trunk/build/platforms/jbossWar.xml (modified) (1 diff)
• trunk/config/bwbuild/default/cal.properties (modified) (2 diffs)
• trunk/config/bwbuild/jboss/activemq-broker-config.xml (added)
• trunk/config/bwbuild/jboss/activemq-jms-ds.xml (added)
• trunk/config/bwbuild/jboss/activemq-ra.xml (added)
• trunk/config/bwbuild/jboss/activemq.xml (deleted)
• trunk/config/bwbuild/jboss/cal.properties (modified) (14 diffs)

trunk/build/platforms/jbossWar.xml

@@ -180 +180 @@
-          <fileset dir="${org.bedework.ear.dir}"/>
-        </copy>
+
+        <!-- If requested we also copy in the activemq configuration. -->
+
+        <if>
+          <istrue value="${org.bedework.global.copy.activemq.config}" />
+          <then>
+            <copy file="${org.bedework.config.home}/activemq-ra.xml"
+                    tofile="${org.bedework.global.activemq.dir}/META-INF/ra.xml"
+                  overwrite="yes" />
+            <copy file="${org.bedework.config.home}/activemq-broker-config.xml"
+                  tofile="${org.bedework.global.activemq.dir}/broker-config.xml"
+                  overwrite="yes" />
+            <copy file="${org.bedework.config.home}/activemq-jms-ds.xml"
+                  tofile="${org.bedework.appserver.deploy.dir}/activemq-jms-ds.xml"
+                  overwrite="yes" />
+          </then>
+        </if>
-      </then>
-    </if>

trunk/config/bwbuild/default/cal.properties

@@ -246 +246 @@
-org.bedework.app.Events.name=DemoCal
-
-
+
+
-#
-# Feed Server
@@ -270 +271 @@
-org.bedework.app.Feeder.name=feeder
-
-
-#
-# --------------------------------------------------------------------

trunk/config/bwbuild/jboss/cal.properties

@@ -17 +17 @@
-#
-# Define the names of the applications we want to build
-
+
+
- Pubcaldav,Usercaldav,caldavTest,test,dumpres,indexer,\
- sysevlog,iosched
@@ -73 +74 @@
-# How would you like your wars sir? zipped or unzipped?
-org.bedework.global.wars.zipped=no
+
-#
-# ------------------------------------------------------------------------
@@ -130 +132 @@
-#  Set to yes if you want your log4j.xml overwritten
-org.bedework.deploy.log4j.config=no
+
+# ------------------------------------------------------------------------
+# 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
+
-#
-# ------------------------------------------------------------------------
@@ -159 +171 @@
-#
-
+org.bedework.app.tzsvr.war.only=yes
-org.bedework.app.tzsvr.project=bwtzsvr
-org.bedework.app.tzsvr.sou.dir=tzsvr
@@ -169 +182 @@
-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
-
@@ -193 +206 @@
-org.bedework.app.bwconfig.context.root=/bwconfig
-org.bedework.app.bwconfig.resources.dir=${org.bedework.server.resource.root.dir}/bwconfigrsrc
-/webapps
+${org.bedework.appserver.deploy.dir}
-org.bedework.app.bwconfig.description=Bedework properties config application
-org.bedework.app.bwconfig.display.name=Bedework Config
@@ -216 +229 @@
-#org.bedework.app.CalAdmin.virtual.host=
-org.bedework.app.CalAdmin.resources.dir=${org.bedework.server.resource.root.dir}/caladminrsrc
-/webapps
+${org.bedework.appserver.deploy.dir}
-
-org.bedework.app.CalAdmin.security.domain=bedeworkdemo
@@ -243 +256 @@
-#org.bedework.app.EventSubmit.virtual.host=
-org.bedework.app.EventSubmit.resources.dir=${org.bedework.server.resource.root.dir}/eventsubmitrsrc
-/webapps
+${org.bedework.appserver.deploy.dir}
-
-org.bedework.app.EventSubmit.security.domain=bedeworkdemo
@@ -270 +283 @@
-#org.bedework.app.Events.virtual.host=
-org.bedework.app.Events.resources.dir=${org.bedework.server.resource.root.dir}/calrsrc
-/webapps
+${org.bedework.appserver.deploy.dir}
-org.bedework.app.Events.cal.suite=MainCampus
-
@@ -276 +289 @@
-org.bedework.app.Events.display.name=Demo calendar
-org.bedework.app.Events.name=DemoCal
+
+#
+# --------------------------------------------------------------------
+#
+# Feed Server
+#
+org.bedework.app.Feeder.project=webapps
+org.bedework.app.Feeder.sou.dir=feeder
+org.bedework.app.Feeder.default.contenttype=text/xml
+# need to model feederweb.xml from publicweb.xml  (check session timeout value.  Change from 30 to 1?)
+org.bedework.app.Feeder.web.xml=war/WEB-INF/web.xml
+org.bedework.app.Feeder.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml
+#org.bedework.app.Feeder.portlet.name=PublicCal
+
+org.bedework.app.Feeder.war.name=feeder
+org.bedework.app.Feeder.context.root=/calfeed
+# Set for jboss
+#org.bedework.app.Feeder.virtual.host=
+org.bedework.app.Feeder.resources.dir=${org.bedework.server.resource.root.dir}/calfeedrsrc
+org.bedework.app.Feeder.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.Feeder.cal.suite=MainCampus
+
+org.bedework.app.Feeder.description=Struts based XML version of the Bedework calendar client. It may have many skins, determined by the XSLT.
+org.bedework.app.Feeder.display.name=Demo calendar
+org.bedework.app.Feeder.name=feeder
-
-#
@@ -294 +332 @@
-#org.bedework.app.SoEDept.virtual.host=
-org.bedework.app.SoEDept.resources.dir=${org.bedework.server.resource.root.dir}/calrsrc
-/webapps
+${org.bedework.appserver.deploy.dir}
-org.bedework.app.SoEDept.cal.suite=SoEDepartmental
-
@@ -318 +356 @@
-#org.bedework.app.UserCal.virtual.host=
-org.bedework.app.UserCal.resources.dir=${org.bedework.server.resource.root.dir}/ucalrsrc
-/webapps
+${org.bedework.appserver.deploy.dir}
-
-org.bedework.app.UserCal.security.domain=bedeworkdemo
@@ -347 +385 @@
-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
-
@@ -373 +411 @@
-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
-