activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r379623 [8/18] - in /incubator/activemq/trunk: ./ activecluster/ activecluster/src/java/org/apache/activecluster/ activecluster/src/java/org/apache/activecluster/group/ activecluster/src/java/org/apache/activecluster/impl/ activeio/ activei...
Date Tue, 21 Feb 2006 23:29:06 GMT
Modified: incubator/activemq/trunk/assembly/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/main/resources/META-INF/LICENSE.txt?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/resources/META-INF/LICENSE.txt (original)
+++ incubator/activemq/trunk/assembly/src/main/resources/META-INF/LICENSE.txt Tue Feb 21 15:28:33 2006
@@ -1,203 +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.
-
+
+                                 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.
+

Propchange: incubator/activemq/trunk/assembly/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/release/conf/activemq.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/release/conf/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/release/docs/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/release/example/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/release/example/conf/activemq-stomp.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/release/example/conf/activemq.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/release/example/conf/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/release/example/conf/resin-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/assembly/src/release/example/conf/web.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/release/example/conf/web.xml?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/example/conf/web.xml (original)
+++ incubator/activemq/trunk/assembly/src/release/example/conf/web.xml Tue Feb 21 15:28:33 2006
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-
-  <display-name>ActiveMQ Message Broker Web Application</display-name>
-
-  <description>
-        ActiveMQ web application to deploy the Broker in a servlet engine.
-  </description>
-
-  <context-param>
-    <param-name>brokerURI</param-name>
-    <param-value>/WEB-INF/activemq.xml</param-value>
-  </context-param>
-
-  <listener>
-    <listener-class>org.apache.activemq.web.</listener-class>
-  </listener>
-</web-app>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+  <display-name>ActiveMQ Message Broker Web Application</display-name>
+
+  <description>
+        ActiveMQ web application to deploy the Broker in a servlet engine.
+  </description>
+
+  <context-param>
+    <param-name>brokerURI</param-name>
+    <param-value>/WEB-INF/activemq.xml</param-value>
+  </context-param>
+
+  <listener>
+    <listener-class>org.apache.activemq.web.</listener-class>
+  </listener>
+</web-app>
+

Propchange: incubator/activemq/trunk/assembly/src/release/example/conf/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/release/userGuide.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/sample-conf/jdbc-example.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/sample-conf/journal-example.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/sample-conf/journaledjdbc-example.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/sample-conf/memory-example.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/config/config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/config/example.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/config/spring-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/activemq.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/receiver-activecluster.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/receiver-http.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/receiver.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/sender-http.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/usecases/sender.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/build.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/build.properties?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/build.properties (original)
+++ incubator/activemq/trunk/build.properties Tue Feb 21 15:28:33 2006
@@ -1,5 +1,5 @@
-maven.site.deploy.method=ssh
-#pom.siteAddress=http://activemq.codehaus.org/
-#pom.siteDirectory=c:\deployment\
-
-#maven.xdoc.distributionUrl=http://dist.codehaus.org/activemq/distributions/
+maven.site.deploy.method=ssh
+#pom.siteAddress=http://activemq.codehaus.org/
+#pom.siteDirectory=c:\deployment\
+
+#maven.xdoc.distributionUrl=http://dist.codehaus.org/activemq/distributions/

Propchange: incubator/activemq/trunk/build.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/etc/checkstyle.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/etc/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/etc/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/etc/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/jmeter/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/maven.xml?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/maven.xml (original)
+++ incubator/activemq/trunk/jmeter/maven.xml Tue Feb 21 15:28:33 2006
@@ -1,118 +1,118 @@
-<?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 default="jar:jar" xmlns:ant="jelly:ant">
-    
-    <postGoal name="jar:jar">
-        <move file="target\${maven.final.name}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
-
-        <!-- copy JMeter TestPlans -->
-        <copy todir="${jmeter.home}\bin\testfiles" overwrite="true">
-            <fileset dir="resource\TestPlans"/>
-        </copy>
-
-
-        <!-- jmeter bin files -->
-        <copy file="resource\jmeter" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\jmeter-server" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\jmeter.bat" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\jmeter-n.bat" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\jmeter-server.bat" todir="${jmeter.home}\bin"  overwrite="true"/>
-        <copy file="resource\jmeter-t.bat" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\jmeterw.bat" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\BeanShellAssertion.bshrc" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\BeanShellFunction.bshrc" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\BeanShellSampler.bshrc" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\BeanShellSampler.bshrc" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\log4j.conf" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\users.dtd" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\jmeter.properties" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\jmetertest.properties" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\saveservice.properties" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\upgrade.properties" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\logkit.xml" todir="${jmeter.home}\bin" overwrite="true"/>
-        <copy file="resource\users.xml" todir="${jmeter.home}\bin" overwrite="true"/>
-        
-        <!-- jmeter lib\ext jars-->
-        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_tcp-${ApacheJMeter_tcp_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
-        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_monitors-${ApacheJMeter_monitors_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
-        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_mail-${ApacheJMeter_mail_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
-        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_ldap-${ApacheJMeter_ldap_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
-        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_jms-${ApacheJMeter_jms_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
-	    <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_jdbc-${ApacheJMeter_jdbc_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
-	    <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_java-${ApacheJMeter_java_version}.jar" todir="${jmeter.home}\lib\ext" overwrite="true"/>
-	    <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_http-${ApacheJMeter_http_version}.jar" todir="${jmeter.home}\lib\ext" overwrite="true"/>
-	    <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_functions-${ApacheJMeter_functions_version}.jar" todir="${jmeter.home}\lib\ext" overwrite="true"/>
-        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_ftp-${ApacheJMeter_ftp_version}.jar" todir="${jmeter.home}\lib\ext" overwrite="true"/>
-        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_core-${ApacheJMeter_core_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
-        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_components-${ApacheJMeter_components_version}.jar" todir="${jmeter.home}\lib\ext" overwrite="true"/>
-        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter-1.0.jar" todir="${jmeter.home}\bin" overwrite="true"/>
-        <move file="${jmeter.home}\bin\ApacheJMeter-${ApacheJMeter_version}.jar" tofile="${jmeter.home}\bin\ApacheJMeter.jar"/>
-        
-        <!-- jmeter lib jars and files -->
-        <copy file="resource\js_jar_license(mozilla).html" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="resource\junit_license.html" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\activemq\jars\activemq-${pom.currentVersion}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\avalon-framework\jars\avalon-framework-${avalon_framework_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\batik\jars\batik-awt-util-${batik_awt_util_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\commons-collections\jars\commons-collections-${commons_collections_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\commons-httpclient\jars\commons-httpclient-${commons_httpclient_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\commons-logging\jars\commons-logging-${commons_logging_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\concurrent\jars\concurrent-${concurrent_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\excalibur-datasource\jars\excalibur-datasource-${excalibur_datasource_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\excalibur-instrument\jars\excalibur-instrument-${excalibur_instrument_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\excalibur-logger\jars\excalibur-logger-${excalibur_logger_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\excalibur-pool\jars\excalibur-pool-${excalibur_pool_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\geronimo-spec\jars\geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar" todir="${jmeter.home}\lib"  overwrite="true"/>
-        <copy file="${maven.repo.local}\htmlparser\jars\htmlparser-${htmlparser_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\oro\jars\jakarta-oro-${jakarta_oro_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\jdom\jars\jdom-${jdom_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\jorphan\jars\jorphan-${jorphan_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\js\jars\js-${js_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\junit\jars\junit-${junit_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\logkit\jars\logkit-${logkit_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\soap\jars\soap-${soap_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\tidy\jars\Tidy-${Tidy_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\velocity\jars\velocity-${velocity_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\xalan\jars\xalan-${xalan_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\xerces\jars\xercesImpl-${xercesImpl_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\xml-apis\jars\xml-apis-${xml_apis_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\xpp3\jars\xpp3_min-${xpp3_min_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\xstream\jars\xstream-${xstream_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\manta\jars\manta-${manta_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\log4j\jars\log4j-${log4j_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\mx4j\jars\mx4j-${mx4j_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="${maven.repo.local}\antlr\jars\antlr-${antlr_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
-        
-        <copy file="resource\jar_usage.txt" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="resource\LICENSE(jdom).txt" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="resource\LICENSE(jtidy).txt" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="resource\LICENSE(XPP3).txt" todir="${jmeter.home}\lib" overwrite="true"/>
-        <copy file="resource\LICENSE(XStream).txt" todir="${jmeter.home}\lib" overwrite="true"/>
-                
-        <ant:zip zipfile="${jmeter.home}\..\${activemq.jmeter.distribution.name}-${pom.currentVersion}.zip" basedir="${jmeter.home}\"></ant:zip>        
-                
-    </postGoal>
-
-    <goal name="clean">
-        <ant:echo>+-----------------------------------------------------+</ant:echo>
-        <ant:echo>| Cleaning: ${basedir}\target </ant:echo>
-        <ant:echo>+-----------------------------------------------------+</ant:echo>
-        <delete dir="${basedir}/target"/>
-    </goal>
-
-
-</project>
+<?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 default="jar:jar" xmlns:ant="jelly:ant">
+    
+    <postGoal name="jar:jar">
+        <move file="target\${maven.final.name}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
+
+        <!-- copy JMeter TestPlans -->
+        <copy todir="${jmeter.home}\bin\testfiles" overwrite="true">
+            <fileset dir="resource\TestPlans"/>
+        </copy>
+
+
+        <!-- jmeter bin files -->
+        <copy file="resource\jmeter" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\jmeter-server" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\jmeter.bat" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\jmeter-n.bat" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\jmeter-server.bat" todir="${jmeter.home}\bin"  overwrite="true"/>
+        <copy file="resource\jmeter-t.bat" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\jmeterw.bat" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\BeanShellAssertion.bshrc" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\BeanShellFunction.bshrc" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\BeanShellSampler.bshrc" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\BeanShellSampler.bshrc" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\log4j.conf" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\users.dtd" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\jmeter.properties" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\jmetertest.properties" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\saveservice.properties" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\upgrade.properties" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\logkit.xml" todir="${jmeter.home}\bin" overwrite="true"/>
+        <copy file="resource\users.xml" todir="${jmeter.home}\bin" overwrite="true"/>
+        
+        <!-- jmeter lib\ext jars-->
+        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_tcp-${ApacheJMeter_tcp_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
+        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_monitors-${ApacheJMeter_monitors_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
+        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_mail-${ApacheJMeter_mail_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
+        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_ldap-${ApacheJMeter_ldap_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
+        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_jms-${ApacheJMeter_jms_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
+	    <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_jdbc-${ApacheJMeter_jdbc_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
+	    <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_java-${ApacheJMeter_java_version}.jar" todir="${jmeter.home}\lib\ext" overwrite="true"/>
+	    <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_http-${ApacheJMeter_http_version}.jar" todir="${jmeter.home}\lib\ext" overwrite="true"/>
+	    <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_functions-${ApacheJMeter_functions_version}.jar" todir="${jmeter.home}\lib\ext" overwrite="true"/>
+        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_ftp-${ApacheJMeter_ftp_version}.jar" todir="${jmeter.home}\lib\ext" overwrite="true"/>
+        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_core-${ApacheJMeter_core_version}.jar" todir="${jmeter.home}\lib\ext"  overwrite="true"/>
+        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter_components-${ApacheJMeter_components_version}.jar" todir="${jmeter.home}\lib\ext" overwrite="true"/>
+        <copy file="${maven.repo.local}\jmeter\jars\ApacheJMeter-1.0.jar" todir="${jmeter.home}\bin" overwrite="true"/>
+        <move file="${jmeter.home}\bin\ApacheJMeter-${ApacheJMeter_version}.jar" tofile="${jmeter.home}\bin\ApacheJMeter.jar"/>
+        
+        <!-- jmeter lib jars and files -->
+        <copy file="resource\js_jar_license(mozilla).html" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="resource\junit_license.html" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\activemq\jars\activemq-${pom.currentVersion}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\avalon-framework\jars\avalon-framework-${avalon_framework_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\batik\jars\batik-awt-util-${batik_awt_util_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\commons-collections\jars\commons-collections-${commons_collections_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\commons-httpclient\jars\commons-httpclient-${commons_httpclient_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\commons-logging\jars\commons-logging-${commons_logging_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\concurrent\jars\concurrent-${concurrent_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\excalibur-datasource\jars\excalibur-datasource-${excalibur_datasource_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\excalibur-instrument\jars\excalibur-instrument-${excalibur_instrument_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\excalibur-logger\jars\excalibur-logger-${excalibur_logger_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\excalibur-pool\jars\excalibur-pool-${excalibur_pool_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\geronimo-spec\jars\geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar" todir="${jmeter.home}\lib"  overwrite="true"/>
+        <copy file="${maven.repo.local}\htmlparser\jars\htmlparser-${htmlparser_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\oro\jars\jakarta-oro-${jakarta_oro_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\jdom\jars\jdom-${jdom_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\jorphan\jars\jorphan-${jorphan_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\js\jars\js-${js_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\junit\jars\junit-${junit_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\logkit\jars\logkit-${logkit_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\soap\jars\soap-${soap_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\tidy\jars\Tidy-${Tidy_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\velocity\jars\velocity-${velocity_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\xalan\jars\xalan-${xalan_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\xerces\jars\xercesImpl-${xercesImpl_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\xml-apis\jars\xml-apis-${xml_apis_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\xpp3\jars\xpp3_min-${xpp3_min_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\xstream\jars\xstream-${xstream_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\manta\jars\manta-${manta_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\log4j\jars\log4j-${log4j_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\mx4j\jars\mx4j-${mx4j_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="${maven.repo.local}\antlr\jars\antlr-${antlr_version}.jar" todir="${jmeter.home}\lib" overwrite="true"/>
+        
+        <copy file="resource\jar_usage.txt" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="resource\LICENSE(jdom).txt" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="resource\LICENSE(jtidy).txt" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="resource\LICENSE(XPP3).txt" todir="${jmeter.home}\lib" overwrite="true"/>
+        <copy file="resource\LICENSE(XStream).txt" todir="${jmeter.home}\lib" overwrite="true"/>
+                
+        <ant:zip zipfile="${jmeter.home}\..\${activemq.jmeter.distribution.name}-${pom.currentVersion}.zip" basedir="${jmeter.home}\"></ant:zip>        
+                
+    </postGoal>
+
+    <goal name="clean">
+        <ant:echo>+-----------------------------------------------------+</ant:echo>
+        <ant:echo>| Cleaning: ${basedir}\target </ant:echo>
+        <ant:echo>+-----------------------------------------------------+</ant:echo>
+        <delete dir="${basedir}/target"/>
+    </goal>
+
+
+</project>

Propchange: incubator/activemq/trunk/jmeter/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/jmeter/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/jmeter/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/project.xml?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/project.xml (original)
+++ incubator/activemq/trunk/jmeter/project.xml Tue Feb 21 15:28:33 2006
@@ -1,348 +1,348 @@
-<?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>
-    <pomVersion>3</pomVersion>
-    <extend>${basedir}/../etc/project.xml</extend>
-
-    <name>ActiveMQ :: Jmeter</name>
-    <id>JMeter_sampler</id>
-    <shortDescription>ActiveMQ Assembly</shortDescription>
-    <description>ActiveMQ Jmeter creates an ActiveMQ sampler for Jmeter</description>
-
-    <package>org.activemq</package>
-
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-    </build>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jorphan</groupId>
-            <artifactId>jorphan</artifactId>
-            <version>${jorphan_version}</version>
-        </dependency>
-
-        <!-- an optional discovery agent -->
-        <dependency>
-            <groupId>activeio</groupId>
-            <artifactId>activeio</artifactId>
-            <version>${activeio_version}</version>
-        </dependency>
-
-        <!-- Derby SQL DB used for testing JDBC message store -->
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derby_version}</version>
-        </dependency>
-
-        <!-- jmeter specific jars -->
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter_components</artifactId>
-            <version>${ApacheJMeter_components_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter_core</artifactId>
-            <version>${ApacheJMeter_core_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter_ftp</artifactId>
-            <version>${ApacheJMeter_ftp_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter_functions</artifactId>
-            <version>${ApacheJMeter_functions_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter_http</artifactId>
-            <version>${ApacheJMeter_http_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter_java</artifactId>
-            <version>${ApacheJMeter_java_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter_jdbc</artifactId>
-            <version>${ApacheJMeter_jdbc_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter_jms</artifactId>
-            <version>${ApacheJMeter_jms_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter_ldap</artifactId>
-            <version>${ApacheJMeter_ldap_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter_mail</artifactId>
-            <version>${ApacheJMeter_mail_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter_monitors</artifactId>
-            <version>${ApacheJMeter_monitors_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter_tcp</artifactId>
-            <version>${ApacheJMeter_tcp_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jmeter</groupId>
-            <artifactId>ApacheJMeter</artifactId>
-            <version>${ApacheJMeter_version}</version>
-        </dependency>
-
-        <dependency>
-            <id>ant</id>
-            <version>1.5</version>
-        </dependency>
-
-        <!-- jmeter lib jars --> 
-        <dependency>
-            <groupId>avalon-framework</groupId>
-            <artifactId>avalon-framework</artifactId>
-            <version>${avalon_framework_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>batik</groupId>
-            <artifactId>batik-awt-util</artifactId>
-            <version>${batik_awt_util_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>${commons_collections_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>${commons_httpclient_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>${commons_logging_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-            <version>${concurrent_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>excalibur-datasource</groupId>
-            <artifactId>excalibur-datasource</artifactId>
-            <version>${excalibur_datasource_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>excalibur-instrument</groupId>
-            <artifactId>excalibur-instrument</artifactId>
-            <version>${excalibur_instrument_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>excalibur-logger</groupId>
-            <artifactId>excalibur-logger</artifactId>
-            <version>${excalibur_logger_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>excalibur-pool</groupId>
-            <artifactId>excalibur-pool</artifactId>
-            <version>${excalibur_pool_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
-            <version>${geronimo_spec_j2ee_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>htmlparser</groupId>
-            <artifactId>htmlparser</artifactId>
-            <version>${htmlparser_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>oro</groupId>
-            <artifactId>jakarta-oro</artifactId>
-            <version>${jakarta_oro_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jdom</groupId>
-            <artifactId>jdom</artifactId>
-            <version>${jdom_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>js</groupId>
-            <artifactId>js</artifactId>
-            <version>${js_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>logkit</groupId>
-            <artifactId>logkit</artifactId>
-            <version>${logkit_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>soap</groupId>
-            <artifactId>soap</artifactId>
-            <version>${soap_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>tidy</groupId>
-            <artifactId>Tidy</artifactId>
-            <version>${Tidy_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>${velocity_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-            <version>${xalan_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xercesImpl_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>${xml_apis_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3_min</artifactId>
-            <version>${xpp3_min_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>${xstream_version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j_version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-            <version>${mx4j_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>antlr</groupId>
-            <artifactId>antlr</artifactId>
-            <version>${antlr_version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>manta</groupId>
-            <artifactId>manta</artifactId>
-            <version>${manta_version}</version>
-        </dependency> 
-                
-    </dependencies>
-    
-   <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
-    <integrationUnitTestSourceDirectory/>
-    <aspectSourceDirectory/>
-    <unitTest>
-      <resources>
-        <resource>
-          <directory>src/test/resources</directory>
-          <includes>
-            <include>**/*.properties</include>
-            <include>**/*.xml</include>
-          </includes>
-        </resource>
-      </resources>
-      <includes>
-      	<include>**/*Test.*</include>
-      </includes>
-      <!-- Test case hangs after receiving 34,946 messages-->
-      <excludes>
-      	<exclude>**/NoDestinationErrorTest.*</exclude>
-      </excludes>
-
-    </unitTest>
-  </build>
-
-</project>
+<?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>
+    <pomVersion>3</pomVersion>
+    <extend>${basedir}/../etc/project.xml</extend>
+
+    <name>ActiveMQ :: Jmeter</name>
+    <id>JMeter_sampler</id>
+    <shortDescription>ActiveMQ Assembly</shortDescription>
+    <description>ActiveMQ Jmeter creates an ActiveMQ sampler for Jmeter</description>
+
+    <package>org.activemq</package>
+
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    </build>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jorphan</groupId>
+            <artifactId>jorphan</artifactId>
+            <version>${jorphan_version}</version>
+        </dependency>
+
+        <!-- an optional discovery agent -->
+        <dependency>
+            <groupId>activeio</groupId>
+            <artifactId>activeio</artifactId>
+            <version>${activeio_version}</version>
+        </dependency>
+
+        <!-- Derby SQL DB used for testing JDBC message store -->
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>${derby_version}</version>
+        </dependency>
+
+        <!-- jmeter specific jars -->
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter_components</artifactId>
+            <version>${ApacheJMeter_components_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter_core</artifactId>
+            <version>${ApacheJMeter_core_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter_ftp</artifactId>
+            <version>${ApacheJMeter_ftp_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter_functions</artifactId>
+            <version>${ApacheJMeter_functions_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter_http</artifactId>
+            <version>${ApacheJMeter_http_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter_java</artifactId>
+            <version>${ApacheJMeter_java_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter_jdbc</artifactId>
+            <version>${ApacheJMeter_jdbc_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter_jms</artifactId>
+            <version>${ApacheJMeter_jms_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter_ldap</artifactId>
+            <version>${ApacheJMeter_ldap_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter_mail</artifactId>
+            <version>${ApacheJMeter_mail_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter_monitors</artifactId>
+            <version>${ApacheJMeter_monitors_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter_tcp</artifactId>
+            <version>${ApacheJMeter_tcp_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jmeter</groupId>
+            <artifactId>ApacheJMeter</artifactId>
+            <version>${ApacheJMeter_version}</version>
+        </dependency>
+
+        <dependency>
+            <id>ant</id>
+            <version>1.5</version>
+        </dependency>
+
+        <!-- jmeter lib jars --> 
+        <dependency>
+            <groupId>avalon-framework</groupId>
+            <artifactId>avalon-framework</artifactId>
+            <version>${avalon_framework_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>batik</groupId>
+            <artifactId>batik-awt-util</artifactId>
+            <version>${batik_awt_util_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>${commons_collections_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>${commons_httpclient_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons_logging_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+            <version>${concurrent_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>excalibur-datasource</groupId>
+            <artifactId>excalibur-datasource</artifactId>
+            <version>${excalibur_datasource_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>excalibur-instrument</groupId>
+            <artifactId>excalibur-instrument</artifactId>
+            <version>${excalibur_instrument_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>excalibur-logger</groupId>
+            <artifactId>excalibur-logger</artifactId>
+            <version>${excalibur_logger_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>excalibur-pool</groupId>
+            <artifactId>excalibur-pool</artifactId>
+            <version>${excalibur_pool_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-j2ee</artifactId>
+            <version>${geronimo_spec_j2ee_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>htmlparser</groupId>
+            <artifactId>htmlparser</artifactId>
+            <version>${htmlparser_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>oro</groupId>
+            <artifactId>jakarta-oro</artifactId>
+            <version>${jakarta_oro_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <version>${jdom_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>js</groupId>
+            <artifactId>js</artifactId>
+            <version>${js_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>logkit</groupId>
+            <artifactId>logkit</artifactId>
+            <version>${logkit_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>soap</groupId>
+            <artifactId>soap</artifactId>
+            <version>${soap_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>tidy</groupId>
+            <artifactId>Tidy</artifactId>
+            <version>${Tidy_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>${velocity_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>${xalan_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>${xercesImpl_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>${xml_apis_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3_min</artifactId>
+            <version>${xpp3_min_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>${xstream_version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j_version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+            <version>${mx4j_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>${antlr_version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>manta</groupId>
+            <artifactId>manta</artifactId>
+            <version>${manta_version}</version>
+        </dependency> 
+                
+    </dependencies>
+    
+   <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
+    <integrationUnitTestSourceDirectory/>
+    <aspectSourceDirectory/>
+    <unitTest>
+      <resources>
+        <resource>
+          <directory>src/test/resources</directory>
+          <includes>
+            <include>**/*.properties</include>
+            <include>**/*.xml</include>
+          </includes>
+        </resource>
+      </resources>
+      <includes>
+      	<include>**/*Test.*</include>
+      </includes>
+      <!-- Test case hangs after receiving 34,946 messages-->
+      <excludes>
+      	<exclude>**/NoDestinationErrorTest.*</exclude>
+      </excludes>
+
+    </unitTest>
+  </build>
+
+</project>

Propchange: incubator/activemq/trunk/jmeter/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/jmeter/resource/LICENSE(XPP3).txt
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/resource/LICENSE%28XPP3%29.txt?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/resource/LICENSE(XPP3).txt (original)
+++ incubator/activemq/trunk/jmeter/resource/LICENSE(XPP3).txt Tue Feb 21 15:28:33 2006
@@ -1,46 +1,46 @@
-Indiana University Extreme! Lab Software License
-
-Version 1.1.1
-
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright notice, 
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if any, 
-   must include the following acknowledgment:
-
-  "This product includes software developed by the Indiana University 
-  Extreme! Lab (http://www.extreme.indiana.edu/)."
-
-Alternately, this acknowledgment may appear in the software itself, 
-if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" 
-must not be used to endorse or promote products derived from this 
-software without prior written permission. For written permission, 
-please contact http://www.extreme.indiana.edu/.
-
-5. Products derived from this software may not use "Indiana Univeristy" 
-name nor may "Indiana Univeristy" appear in their name, without prior 
-written permission of the Indiana University.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Indiana University Extreme! Lab Software License
+
+Version 1.1.1
+
+Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in 
+   the documentation and/or other materials provided with the distribution.
+
+3. The end-user documentation included with the redistribution, if any, 
+   must include the following acknowledgment:
+
+  "This product includes software developed by the Indiana University 
+  Extreme! Lab (http://www.extreme.indiana.edu/)."
+
+Alternately, this acknowledgment may appear in the software itself, 
+if and wherever such third-party acknowledgments normally appear.
+
+4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" 
+must not be used to endorse or promote products derived from this 
+software without prior written permission. For written permission, 
+please contact http://www.extreme.indiana.edu/.
+
+5. Products derived from this software may not use "Indiana Univeristy" 
+name nor may "Indiana Univeristy" appear in their name, without prior 
+written permission of the Indiana University.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Propchange: incubator/activemq/trunk/jmeter/resource/LICENSE(XPP3).txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/jmeter/resource/LICENSE(XStream).txt
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/resource/LICENSE%28XStream%29.txt?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/resource/LICENSE(XStream).txt (original)
+++ incubator/activemq/trunk/jmeter/resource/LICENSE(XStream).txt Tue Feb 21 15:28:33 2006
@@ -1,25 +1,25 @@
-Copyright (c) 2003-2004, Joe Walnes
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer. Redistributions in binary form must reproduce
-the above copyright notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the distribution.
-
-Neither the name of XStream nor the names of its contributors may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+Copyright (c) 2003-2004, Joe Walnes
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer. Redistributions in binary form must reproduce
+the above copyright notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the distribution.
+
+Neither the name of XStream nor the names of its contributors may be used to endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGE.

Propchange: incubator/activemq/trunk/jmeter/resource/LICENSE(XStream).txt
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message