Index: trunk/build/platforms/jbossWar.xml
===================================================================
--- trunk/build/platforms/jbossWar.xml (revision 2718)
+++ trunk/build/platforms/jbossWar.xml (revision 2719)
@@ -180,4 +180,21 @@
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/config/bwbuild/default/cal.properties
===================================================================
--- trunk/config/bwbuild/default/cal.properties (revision 2711)
+++ trunk/config/bwbuild/default/cal.properties (revision 2719)
@@ -246,5 +246,6 @@
org.bedework.app.Events.name=DemoCal
-
+#
+# --------------------------------------------------------------------
#
# Feed Server
@@ -270,5 +271,4 @@
org.bedework.app.Feeder.name=feeder
-
#
# --------------------------------------------------------------------
Index: trunk/config/bwbuild/jboss/activemq-broker-config.xml
===================================================================
--- (revision )
+++ trunk/config/bwbuild/jboss/activemq-broker-config.xml (revision 2719)
@@ -1,0 +1,261 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/config/bwbuild/jboss/activemq-jms-ds.xml
===================================================================
--- (revision )
+++ trunk/config/bwbuild/jboss/activemq-jms-ds.xml (revision 2719)
@@ -1,0 +1,109 @@
+
+
+
+
+
+
+
+ jms/BedeworkConnectionFactory
+
+
+ activemq-rar-5.3.0.rar
+ javax.jms.QueueConnectionFactory
+ tcp://localhost:61616
+
+ 1
+ 200
+ 30000
+ 3
+
+
+
+ activemq/QueueConnectionFactory
+
+
+ activemq-rar-5.3.0.rar
+ javax.jms.QueueConnectionFactory
+ tcp://localhost:61616
+
+ 1
+ 200
+ 30000
+ 3
+
+
+
+ activemq/TopicConnectionFactory
+
+
+ activemq-rar-5.3.0.rar
+ javax.jms.TopicConnectionFactory
+ tcp://localhost:61616
+
+ 1
+ 200
+ 30000
+ 3
+
+
+
+
+ activemq/queue/sysevents
+ jboss.jca:service=RARDeployment,name='activemq-rar-5.3.0.rar'
+ javax.jms.Queue
+ PhysicalName=bedework.sysevents
+
+
+
+
+ activemq/queue/syseventslog
+ jboss.jca:service=RARDeployment,name='activemq-rar-5.3.0.rar'
+ javax.jms.Queue
+ PhysicalName=bedework.sysevents.logger
+
+
+
+
+ activemq/queue/crawler
+ jboss.jca:service=RARDeployment,name='activemq-rar-5.3.0.rar'
+ javax.jms.Queue
+ PhysicalName=bedework.crawler
+
+
+
+
+ activemq/queue/schedulerIn
+ jboss.jca:service=RARDeployment,name='activemq-rar-5.3.0.rar'
+ javax.jms.Queue
+ PhysicalName=bedework.scheduleIn
+
+
+
+
+ activemq/queue/schedulerOut
+ jboss.jca:service=RARDeployment,name='activemq-rar-5.3.0.rar'
+ javax.jms.Queue
+ PhysicalName=bedework.scheduleOut
+
+
+
+
+
Index: trunk/config/bwbuild/jboss/activemq-ra.xml
===================================================================
--- (revision )
+++ trunk/config/bwbuild/jboss/activemq-ra.xml (revision 2719)
@@ -1,0 +1,354 @@
+
+
+
+
+ ActiveMQ inbound and outbound JMS ResourceAdapter
+ ActiveMQ JMS Resource Adapter
+ activemq.org
+ JMS 1.1
+ 1.0
+
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ true
+
+
+ org.apache.activemq.ra.ActiveMQResourceAdapter
+
+
+ The URL to the ActiveMQ server that you want this connection to connect to. If using
+ an embedded broker, this value should be 'vm://localhost'.
+
+ ServerUrl
+ java.lang.String
+ tcp://localhost:61616
+
+
+ The default user name that will be used to establish connections to the ActiveMQ server.
+ UserName
+ java.lang.String
+ defaultUser
+
+
+ The default password that will be used to log the default user into the ActiveMQ server.
+ Password
+ java.lang.String
+ defaultPassword
+
+
+ The client id that will be set on the connection that is established to the ActiveMQ server.
+ Clientid
+ java.lang.String
+
+
+ Boolean to configure if outbound connections should reuse the inbound connection's session for sending messages.
+ UseInboundSession
+ java.lang.Boolean
+ false
+
+
+
+
+
+ Sets the XML configuration file used to configure the embedded ActiveMQ broker via
+ Spring if using embedded mode.
+
+ BrokerXmlConfig is the filename which is assumed to be on the classpath unless
+ a URL is specified. So a value of foo/bar.xml would be assumed to be on the
+ classpath whereas file:dir/file.xml would use the file system.
+ Any valid URL string is supported.
+
+ BrokerXmlConfig
+ java.lang.String
+ xbean:broker-config.xml
+
+
+
+
+
+ org.apache.activemq.ra.ActiveMQManagedConnectionFactory
+ javax.jms.ConnectionFactory
+ org.apache.activemq.ra.ActiveMQConnectionFactory
+ javax.jms.Connection
+ org.apache.activemq.ra.ManagedConnectionProxy
+
+
+ org.apache.activemq.ra.ActiveMQManagedConnectionFactory
+ javax.jms.QueueConnectionFactory
+ org.apache.activemq.ra.ActiveMQConnectionFactory
+ javax.jms.QueueConnection
+ org.apache.activemq.ra.ManagedConnectionProxy
+
+
+ org.apache.activemq.ra.ActiveMQManagedConnectionFactory
+ javax.jms.TopicConnectionFactory
+ org.apache.activemq.ra.ActiveMQConnectionFactory
+ javax.jms.TopicConnection
+ org.apache.activemq.ra.ManagedConnectionProxy
+
+ XATransaction
+
+ BasicPassword
+ javax.resource.spi.security.PasswordCredential
+
+ false
+
+
+
+
+ javax.jms.MessageListener
+
+ org.apache.activemq.ra.ActiveMQActivationSpec
+
+
+ destination
+
+
+ destinationType
+
+
+
+
+
+
+
+ javax.jms.Queue
+ org.apache.activemq.command.ActiveMQQueue
+
+ PhysicalName
+ java.lang.String
+
+
+
+ javax.jms.Topic
+ org.apache.activemq.command.ActiveMQTopic
+
+ PhysicalName
+ java.lang.String
+
+
+
+
Index: trunk/config/bwbuild/jboss/activemq.xml
===================================================================
--- trunk/config/bwbuild/jboss/activemq.xml (revision 2695)
+++ (revision )
@@ -1,259 +1,0 @@
-
-
-
-
-
-
-
-
-
-
- file:///${activemq.base}/conf/credentials.properties
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: trunk/config/bwbuild/jboss/cal.properties
===================================================================
--- trunk/config/bwbuild/jboss/cal.properties (revision 2716)
+++ trunk/config/bwbuild/jboss/cal.properties (revision 2719)
@@ -17,5 +17,6 @@
#
# Define the names of the applications we want to build
-org.bedework.install.app.names=CalAdmin,EventSubmit,Events,SoEDept,UserCal,\
+org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
+ SoEDept,UserCal,\
Pubcaldav,Usercaldav,caldavTest,test,dumpres,indexer,\
sysevlog,iosched
@@ -73,4 +74,5 @@
# How would you like your wars sir? zipped or unzipped?
org.bedework.global.wars.zipped=no
+
#
# ------------------------------------------------------------------------
@@ -130,4 +132,14 @@
# 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,4 +171,5 @@
#
+org.bedework.app.tzsvr.war.only=yes
org.bedework.app.tzsvr.project=bwtzsvr
org.bedework.app.tzsvr.sou.dir=tzsvr
@@ -169,5 +182,5 @@
org.bedework.app.tzsvr.display.name=Bedework timezones server.
org.bedework.app.tzsvr.name=tzsvr
-org.bedework.app.tzsvr.deploy.dir=/webapps
+org.bedework.app.tzsvr.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.tzsvr.logprefix=Tzsvr
@@ -193,5 +206,5 @@
org.bedework.app.bwconfig.context.root=/bwconfig
org.bedework.app.bwconfig.resources.dir=${org.bedework.server.resource.root.dir}/bwconfigrsrc
-org.bedework.app.bwconfig.deploy.dir=/webapps
+org.bedework.app.bwconfig.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.bwconfig.description=Bedework properties config application
org.bedework.app.bwconfig.display.name=Bedework Config
@@ -216,5 +229,5 @@
#org.bedework.app.CalAdmin.virtual.host=
org.bedework.app.CalAdmin.resources.dir=${org.bedework.server.resource.root.dir}/caladminrsrc
-org.bedework.app.CalAdmin.deploy.dir=/webapps
+org.bedework.app.CalAdmin.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.CalAdmin.security.domain=bedeworkdemo
@@ -243,5 +256,5 @@
#org.bedework.app.EventSubmit.virtual.host=
org.bedework.app.EventSubmit.resources.dir=${org.bedework.server.resource.root.dir}/eventsubmitrsrc
-org.bedework.app.EventSubmit.deploy.dir=/webapps
+org.bedework.app.EventSubmit.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.EventSubmit.security.domain=bedeworkdemo
@@ -270,5 +283,5 @@
#org.bedework.app.Events.virtual.host=
org.bedework.app.Events.resources.dir=${org.bedework.server.resource.root.dir}/calrsrc
-org.bedework.app.Events.deploy.dir=/webapps
+org.bedework.app.Events.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.Events.cal.suite=MainCampus
@@ -276,4 +289,29 @@
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,5 +332,5 @@
#org.bedework.app.SoEDept.virtual.host=
org.bedework.app.SoEDept.resources.dir=${org.bedework.server.resource.root.dir}/calrsrc
-org.bedework.app.SoEDept.deploy.dir=/webapps
+org.bedework.app.SoEDept.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.SoEDept.cal.suite=SoEDepartmental
@@ -318,5 +356,5 @@
#org.bedework.app.UserCal.virtual.host=
org.bedework.app.UserCal.resources.dir=${org.bedework.server.resource.root.dir}/ucalrsrc
-org.bedework.app.UserCal.deploy.dir=/webapps
+org.bedework.app.UserCal.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.UserCal.security.domain=bedeworkdemo
@@ -347,5 +385,5 @@
org.bedework.app.Pubcaldav.display.name=Bedework public caldav
org.bedework.app.Pubcaldav.name=DemoPubcaldav
-org.bedework.app.Pubcaldav.deploy.dir=/webapps
+org.bedework.app.Pubcaldav.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.Pubcaldav.logprefix=PubCalDav
@@ -373,5 +411,5 @@
org.bedework.app.Usercaldav.display.name=Bedework usercaldav
org.bedework.app.Usercaldav.name=DemoUsrcaldav
-org.bedework.app.Usercaldav.deploy.dir=/webapps
+org.bedework.app.Usercaldav.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.Usercaldav.logprefix=UserCalDav