You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gn...@apache.org on 2006/04/17 22:38:23 UTC
svn commit: r394772 - in /incubator/activemq/trunk: ./ activemq-ra/
activemq-rar/ activemq-rar/src/ activemq-rar/src/main/
activemq-rar/src/main/rar/ activemq-rar/src/main/rar/META-INF/
activemq-web-demo/ assembly/ assembly/src/main/descriptors/
Author: gnodet
Date: Mon Apr 17 13:38:21 2006
New Revision: 394772
URL: http://svn.apache.org/viewcvs?rev=394772&view=rev
Log:
Now the distribution fully works on m2 (without tests).
However, we need to rework all the scope of dependencies (mainly for activemq-core)
Added:
incubator/activemq/trunk/activemq-rar/
incubator/activemq/trunk/activemq-rar/pom.xml
incubator/activemq/trunk/activemq-rar/src/
incubator/activemq/trunk/activemq-rar/src/main/
incubator/activemq/trunk/activemq-rar/src/main/rar/
incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/
incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/DISCLAIMER.txt
incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/LICENSE.txt
incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/ra.xml
incubator/activemq/trunk/activemq-rar/src/main/rar/broker-config.xml
Modified:
incubator/activemq/trunk/activemq-ra/pom.xml
incubator/activemq/trunk/activemq-web-demo/pom.xml
incubator/activemq/trunk/assembly/pom.xml
incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml
incubator/activemq/trunk/pom.xml
Modified: incubator/activemq/trunk/activemq-ra/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-ra/pom.xml?rev=394772&r1=394771&r2=394772&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-ra/pom.xml (original)
+++ incubator/activemq/trunk/activemq-ra/pom.xml Mon Apr 17 13:38:21 2006
@@ -31,7 +31,6 @@
</parent>
<artifactId>activemq-ra</artifactId>
- <packaging>rar</packaging>
<name>ActiveMQ :: RA</name>
<description>A JCA Resource Adapter used to integrate ActiveMQ with transactional enterprise containers</description>
Added: incubator/activemq/trunk/activemq-rar/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-rar/pom.xml?rev=394772&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-rar/pom.xml (added)
+++ incubator/activemq/trunk/activemq-rar/pom.xml Mon Apr 17 13:38:21 2006
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright 2005-2006 The Apache Software Foundation
+
+ 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.
+-->
+
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq-parent</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>activemq-rar</artifactId>
+ <packaging>rar</packaging>
+ <name>ActiveMQ :: RAR</name>
+ <description>A JCA Resource Adapter used to integrate ActiveMQ with transactional enterprise containers</description>
+
+ <dependencies>
+
+ <!-- activemq -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>axion</groupId>
+ <artifactId>axion</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>activemq-jaas</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>howl</groupId>
+ <artifactId>howl-logger</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>activemq</groupId>
+ <artifactId>smackx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>activemq</groupId>
+ <artifactId>smack</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-tools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>activemq</groupId>
+ <artifactId>jmdns</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xmlpublic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean_xpath</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Added: incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/DISCLAIMER.txt
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/DISCLAIMER.txt?rev=394772&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/DISCLAIMER.txt (added)
+++ incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/DISCLAIMER.txt Mon Apr 17 13:38:21 2006
@@ -0,0 +1,7 @@
+ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
+accepted projects until a further review indicates that the infrastructure,
+communications, and decision making process have stabilized in a manner
+consistent with other successful ASF projects. While incubation status is not
+necessarily a reflection of the completeness or stability of the code, it does
+indicate that the project has yet to be fully endorsed by the ASF.
\ No newline at end of file
Added: incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/LICENSE.txt?rev=394772&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/LICENSE.txt (added)
+++ incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/LICENSE.txt Mon Apr 17 13:38:21 2006
@@ -0,0 +1,203 @@
+
+ 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.
+
Added: incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/ra.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/ra.xml?rev=394772&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/ra.xml (added)
+++ incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/ra.xml Mon Apr 17 13:38:21 2006
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005-2006 The Apache Software Foundation
+
+ 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.
+-->
+
+<connector xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
+ version="1.5">
+ <description>ActiveMQ inbound and outbound JMS ResourceAdapter</description>
+ <display-name>ActiveMQ JMS Resource Adapter</display-name>
+ <vendor-name>activemq.org</vendor-name>
+ <eis-type>JMS 1.1</eis-type>
+ <resourceadapter-version>1.0</resourceadapter-version>
+ <license>
+ <description>
+
+ Copyright 2005-2006 The Apache Software Foundation
+
+ 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.
+
+ </description>
+ <license-required>true</license-required>
+ </license>
+ <resourceadapter>
+ <resourceadapter-class>org.apache.activemq.ra.ActiveMQResourceAdapter</resourceadapter-class>
+ <config-property>
+ <description>
+ 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'.
+ </description>
+ <config-property-name>ServerUrl</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>tcp://localhost:61616</config-property-value>
+<!-- <config-property-value>vm://localhost</config-property-value> -->
+ </config-property>
+ <config-property>
+ <description>The default user name that will be used to establish connections to the ActiveMQ server.</description>
+ <config-property-name>UserName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>defaultUser</config-property-value>
+ </config-property>
+ <config-property>
+ <description>The default password that will be used to log the default user into the ActiveMQ server.</description>
+ <config-property-name>Password</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>defaultPassword</config-property-value>
+ </config-property>
+ <config-property>
+ <description>The client id that will be set on the connection that is established to the ActiveMQ server.</description>
+ <config-property-name>Clientid</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>Boolean to configure if outbound connections should reuse the inbound connection's session for sending messages.</description>
+ <config-property-name>UseInboundSession</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+
+ <!-- NOTE disable the following property if you do not wish to deploy an embedded broker -->
+ <config-property>
+ <description>
+ 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.
+ </description>
+ <config-property-name>BrokerXmlConfig</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ <!--
+ <config-property-value>xbean:broker-config.xml</config-property-value>
+ -->
+ </config-property>
+
+ <outbound-resourceadapter>
+ <connection-definition>
+ <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+ <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+ <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+ <connection-interface>javax.jms.Connection</connection-interface>
+ <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
+ </connection-definition>
+ <connection-definition>
+ <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+ <connectionfactory-interface>javax.jms.QueueConnectionFactory</connectionfactory-interface>
+ <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+ <connection-interface>javax.jms.QueueConnection</connection-interface>
+ <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
+ </connection-definition>
+ <connection-definition>
+ <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+ <connectionfactory-interface>javax.jms.TopicConnectionFactory</connectionfactory-interface>
+ <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+ <connection-interface>javax.jms.TopicConnection</connection-interface>
+ <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
+ </connection-definition>
+ <transaction-support>XATransaction</transaction-support>
+ <authentication-mechanism>
+ <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
+ <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+ </authentication-mechanism>
+ <reauthentication-support>false</reauthentication-support>
+ </outbound-resourceadapter>
+ <inbound-resourceadapter>
+ <messageadapter>
+ <messagelistener>
+ <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
+ <activationspec>
+ <activationspec-class>org.apache.activemq.ra.ActiveMQActivationSpec</activationspec-class>
+
+ <required-config-property>
+ <config-property-name>destination</config-property-name>
+ </required-config-property>
+ <required-config-property>
+ <config-property-name>destinationType</config-property-name>
+ </required-config-property>
+
+ </activationspec>
+ </messagelistener>
+ </messageadapter>
+ </inbound-resourceadapter>
+ <adminobject>
+ <adminobject-interface>javax.jms.Queue</adminobject-interface>
+ <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
+ <config-property>
+ <config-property-name>PhysicalName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ </adminobject>
+ <adminobject>
+ <adminobject-interface>javax.jms.Topic</adminobject-interface>
+ <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
+ <config-property>
+ <config-property-name>PhysicalName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ </adminobject>
+ </resourceadapter>
+</connector>
Added: incubator/activemq/trunk/activemq-rar/src/main/rar/broker-config.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-rar/src/main/rar/broker-config.xml?rev=394772&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-rar/src/main/rar/broker-config.xml (added)
+++ incubator/activemq/trunk/activemq-rar/src/main/rar/broker-config.xml Mon Apr 17 13:38:21 2006
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005-2006 The Apache Software Foundation
+
+ 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.
+-->
+<!-- START SNIPPET: xbean -->
+<beans xmlns="http://activemq.org/config/1.0">
+
+ <broker useJmx="true">
+
+ <!-- In ActiveMQ 4, you can setup destination policies. note: this xml format may still change a bit -->
+ <destinationPolicy>
+ <policyMap><policyEntries>
+
+ <policyEntry topic="FOO.>">
+ <dispatchPolicy>
+ <strictOrderDispatchPolicy />
+ </dispatchPolicy>
+ <subscriptionRecoveryPolicy>
+ <lastImageSubscriptionRecoveryPolicy />
+ </subscriptionRecoveryPolicy>
+ </policyEntry>
+
+ </policyEntries></policyMap>
+ </destinationPolicy>
+
+
+ <persistenceAdapter>
+ <journaledJDBC journalLogFiles="5" dataDirectory="../data"/>
+ <!-- To use a different datasource, use th following syntax : -->
+ <!--
+ <journaledJDBC journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/>
+ -->
+ </persistenceAdapter>
+
+ <transportConnectors>
+ <!-- prefixing a connector with discovery: causes the connector to be advertiesed over rendezvous -->
+ <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+ </transportConnectors>
+
+ <networkConnectors>
+ <!-- by default just auto discover the other brokers -->
+ <networkConnector uri="multicast://default"/>
+ <!--
+ <networkConnector uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
+ -->
+ </networkConnectors>
+
+ </broker>
+
+
+</beans>
Modified: incubator/activemq/trunk/activemq-web-demo/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web-demo/pom.xml?rev=394772&r1=394771&r2=394772&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web-demo/pom.xml (original)
+++ incubator/activemq/trunk/activemq-web-demo/pom.xml Mon Apr 17 13:38:21 2006
@@ -32,7 +32,7 @@
<artifactId>activemq-web-demo</artifactId>
<packaging>war</packaging>
- <name>ActiveMQ :: Web</name>
+ <name>ActiveMQ :: Web Demo</name>
<description>Web Demo for REST API and Streamlets support</description>
<build>
Modified: incubator/activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/pom.xml?rev=394772&r1=394771&r2=394772&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Mon Apr 17 13:38:21 2006
@@ -60,11 +60,6 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>activemq-ra</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>activemq-jaas</artifactId>
</dependency>
<dependency>
@@ -79,7 +74,7 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>activemq-ra</artifactId>
+ <artifactId>activemq-rar</artifactId>
<type>rar</type>
<optional>true</optional>
</dependency>
Modified: incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml?rev=394772&r1=394771&r2=394772&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml Mon Apr 17 13:38:21 2006
@@ -78,7 +78,7 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
- <include>incubator-activemq:activemq-ra</include>
+ <include>incubator-activemq:activemq-rar</include>
<include>incubator-activemq:activemq-optional</include>
<include>incubator-activemq:activecluster</include>
<include>commons-beanutils:commons-beanutils</include>
Modified: incubator/activemq/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/pom.xml?rev=394772&r1=394771&r2=394772&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Mon Apr 17 13:38:21 2006
@@ -126,6 +126,7 @@
<module>activemq-core</module>
<module>activemq-console</module>
<module>activemq-ra</module>
+ <module>activemq-rar</module>
<module>activemq-web</module>
<module>activemq-web-demo</module>
<module>activemq-optional</module>
@@ -216,6 +217,11 @@
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-ra</artifactId>
<version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>activemq-rar</artifactId>
+ <version>${pom.version}</version>
<type>rar</type>
</dependency>
<dependency>
@@ -249,6 +255,22 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.0</version>
+ <!--
+ <exclusions>
+ <exclusion>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ -->
</dependency>
<dependency>
@@ -319,7 +341,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>1.2.4</version>
+ <version>1.2.6</version>
<optional>true</optional>
</dependency>