Changeset 2787

Timestamp:

02/18/10 16:25:28

Author:

douglm

Message:

Rearrange source and build so that the monitor module is built and deployed along with the rest.

Filter the crawler queue or a rebuild will fail due to self generated messages

Add a read-only message count property to the indexer

Files:

• trunk/config/bwbuild/jboss/activemq-broker-config.xml (modified) (1 diff)
• trunk/config/bwbuild/jboss/cal.options.xml (modified) (1 diff)
• trunk/config/bwbuild/jboss/cal.properties (modified) (2 diffs)
• trunk/deployment/monitor (added)
• trunk/deployment/monitor/shellscr (added)
• trunk/deployment/monitor/shellscr/META-INF (added)
• trunk/deployment/monitor/shellscr/META-INF/jboss-service.xml (added)
• trunk/deployment/monitor/shellscr/META-INF/jboss-structure.xml (added)
• trunk/deployment/monitor/shellscr/appjars.xml (added)
• trunk/deployment/monitor/shellscr/build.xml (added)
• trunk/deployment/monitor/shellscr/resources (added)
• trunk/deployment/monitor/shellscr/resources/bwrun.bat (added)
• trunk/deployment/monitor/shellscr/resources/bwrun.sh (added)
• trunk/deployment/monitor/shellscr/resources/log4j.xml (added)

trunk/config/bwbuild/jboss/activemq-broker-config.xml

@@ -84 +84 @@
-              <queue physicalName="bedework.sysevents.logger" />
-              <queue physicalName="bedework.sysevents.monitor" />
-
+
+
-              <filteredDestination selector="inbox = 'true'"
-                                   queue="bedework.scheduleIn"/>

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

@@ -511 +511 @@
-
-        <!-- ==================================================================
+                          System events monitor program
+             ================================================================== -->
+        <monitor classname="org.bedework.calfacade.configs.BwCrawlerConfig">
+          <debug>true</debug>
+          <appType>monitor</appType>
+          <guestMode>true</guestMode>
+          <debugEntity>false</debugEntity>
+        </monitor>
+
+        <!-- ==================================================================
-                          In/outbox scheduler program
-             ================================================================== -->

trunk/config/bwbuild/jboss/cal.properties

@@ -19 +19 @@
-org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
- SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres,indexer,\
-
+,monitor
-
-#
@@ -491 +491 @@
-# --------------------------------------------------------------------
-#
+# 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
+
+#
+# --------------------------------------------------------------------
+#
-# In/outbox scheduler
-#