You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@activemq.apache.org by Hiram Chirino <ch...@gmail.com> on 2009/06/22 19:37:23 UTC
Re: svn commit: r786768 - in /activemq/sandbox/activemq-flow: ./
activemq-broker/ activemq-network/ activemq-protobuf/activemq-protobuf-test/
activemq-protobuf/activemq-protobuf/ activemq-spring/ kahadb/
David,
Is there a reason for taking out the eclipse plugin config?
On Sat, Jun 20, 2009 at 4:15 AM, <dj...@apache.org> wrote:
> Author: djencks
> Date: Sat Jun 20 08:15:30 2009
> New Revision: 786768
>
> URL: http://svn.apache.org/viewvc?rev=786768&view=rev
> Log:
> ACTIVEMQ-2297 update to nexus, apache 6 pom, etc. Protobuf needs more
> attention
>
> Added:
> activemq/sandbox/activemq-flow/LICENSE
> activemq/sandbox/activemq-flow/NOTICE
> Modified:
> activemq/sandbox/activemq-flow/activemq-broker/pom.xml
> activemq/sandbox/activemq-flow/activemq-network/pom.xml
>
> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf-test/pom.xml
>
> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf/pom.xml
> activemq/sandbox/activemq-flow/activemq-spring/pom.xml
> activemq/sandbox/activemq-flow/kahadb/pom.xml
> activemq/sandbox/activemq-flow/pom.xml
>
> Added: activemq/sandbox/activemq-flow/LICENSE
> URL:
> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/LICENSE?rev=786768&view=auto
>
> ==============================================================================
> --- activemq/sandbox/activemq-flow/LICENSE (added)
> +++ activemq/sandbox/activemq-flow/LICENSE Sat Jun 20 08:15:30 2009
> @@ -0,0 +1,202 @@
> +
> + 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: activemq/sandbox/activemq-flow/NOTICE
> URL:
> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/NOTICE?rev=786768&view=auto
>
> ==============================================================================
> --- activemq/sandbox/activemq-flow/NOTICE (added)
> +++ activemq/sandbox/activemq-flow/NOTICE Sat Jun 20 08:15:30 2009
> @@ -0,0 +1,8 @@
> +
> +ActiveMQ
> +Copyright 2005-2009 The Apache Software Foundation
> +
> +This product includes software developed at
> +The Apache Software Foundation (http://www.apache.org/).
> +
> +
>
> Modified: activemq/sandbox/activemq-flow/activemq-broker/pom.xml
> URL:
> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>
> ==============================================================================
> --- activemq/sandbox/activemq-flow/activemq-broker/pom.xml (original)
> +++ activemq/sandbox/activemq-flow/activemq-broker/pom.xml Sat Jun 20
> 08:15:30 2009
> @@ -37,11 +37,11 @@
> <name>Java.net Maven Repository </name>
> <url>http://download.java.net/maven/2</url>
> </repository>
> - <repository>
> - <id>codehaus</id>
> - <name>Codehaus Maven 2 Repository</name>
> - <url>http://repository.codehaus.org/</url>
> - </repository>
> + <!--<repository>-->
> + <!--<id>codehaus</id>-->
> + <!--<name>Codehaus Maven 2 Repository</name>-->
> + <!--<url>http://repository.codehaus.org/</url>-->
> + <!--</repository>-->
> </repositories>
>
> <pluginRepositories>
>
> Modified: activemq/sandbox/activemq-flow/activemq-network/pom.xml
> URL:
> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>
> ==============================================================================
> --- activemq/sandbox/activemq-flow/activemq-network/pom.xml (original)
> +++ activemq/sandbox/activemq-flow/activemq-network/pom.xml Sat Jun 20
> 08:15:30 2009
> @@ -71,7 +71,6 @@
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-surefire-plugin</artifactId>
> - <version>${org-apache-maven-surefire-plugin-version}</version>
> <configuration>
> <excludes>
> <!-- Disable all the tests for now -->
>
> Modified:
> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf-test/pom.xml
> URL:
> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf-test/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>
> ==============================================================================
> ---
> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf-test/pom.xml
> (original)
> +++
> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf-test/pom.xml
> Sat Jun 20 08:15:30 2009
> @@ -19,9 +19,9 @@
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> - <groupId>org.apache.activemq.protobuf</groupId>
> - <artifactId>activemq-protobuf-pom</artifactId>
> - <version>1.1-SNAPSHOT</version>
> + <groupId>org.apache.activemq</groupId>
> + <artifactId>activemq-parent</artifactId>
> + <version>6.0-SNAPSHOT</version>
> </parent>
>
> <groupId>org.apache.activemq.protobuf</groupId>
> @@ -35,7 +35,6 @@
> <dependency>
> <groupId>junit</groupId>
> <artifactId>junit</artifactId>
> - <version>4.4</version>
> <scope>test</scope>
> </dependency>
> <dependency>
> @@ -48,21 +47,6 @@
> <build>
> <plugins>
> <plugin>
> - <artifactId>maven-compiler-plugin</artifactId>
> - <configuration>
> - <source>1.5</source>
> - <target>1.5</target>
> - </configuration>
> - </plugin>
> - <plugin>
> - <artifactId>maven-surefire-plugin</artifactId>
> - <configuration>
> - <includes>
> - <include>**/*Test.java</include>
> - </includes>
> - </configuration>
> - </plugin>
> - <plugin>
> <groupId>org.apache.activemq.protobuf</groupId>
> <artifactId>activemq-protobuf</artifactId>
> <version>1.1-SNAPSHOT</version>
>
> Modified:
> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf/pom.xml
> URL:
> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>
> ==============================================================================
> ---
> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf/pom.xml
> (original)
> +++
> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf/pom.xml
> Sat Jun 20 08:15:30 2009
> @@ -16,33 +16,33 @@
> limitations under the License.
> -->
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
> <parent>
> - <groupId>org.apache.activemq.protobuf</groupId>
> - <artifactId>activemq-protobuf-pom</artifactId>
> - <version>1.1-SNAPSHOT</version>
> + <groupId>org.apache.activemq</groupId>
> + <artifactId>activemq-parent</artifactId>
> + <version>6.0-SNAPSHOT</version>
> </parent>
>
> <groupId>org.apache.activemq.protobuf</groupId>
> <artifactId>activemq-protobuf</artifactId>
> <version>1.1-SNAPSHOT</version>
> <packaging>maven-plugin</packaging>
> -
> +
> <name>ActiveMQ Protocol Buffers Implementation and Compiler</name>
>
> <description>
> - A Simpler Protocol Buffer Java API. Includes a Proto to Java
> compiler.
> + A Simpler Protocol Buffer Java API. Includes a Proto to Java compiler.
> </description>
>
> <dependencies>
> -
> +
> <dependency>
> <groupId>org.apache.activemq</groupId>
> <artifactId>activemq-util</artifactId>
> <version>6.0-SNAPSHOT</version>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.maven</groupId>
> <artifactId>maven-plugin-api</artifactId>
> @@ -55,37 +55,15 @@
> <version>2.0</version>
> <optional>true</optional>
> </dependency>
> -
> - <dependency>
> - <groupId>junit</groupId>
> - <artifactId>junit</artifactId>
> - <version>4.4</version>
> - <scope>test</scope>
> - </dependency>
> </dependencies>
> -
> +
> <build>
> <plugins>
> <plugin>
> - <artifactId>maven-compiler-plugin</artifactId>
> - <configuration>
> - <source>1.5</source>
> - <target>1.5</target>
> - </configuration>
> - </plugin>
> - <plugin>
> - <artifactId>maven-surefire-plugin</artifactId>
> - <configuration>
> - <includes>
> - <include>**/*Test.java</include>
> - </includes>
> - </configuration>
> - </plugin>
> - <plugin>
> <groupId>org.codehaus.mojo</groupId>
> <artifactId>javacc-maven-plugin</artifactId>
> <version>2.4.1</version>
> - <executions>
> + <executions>
> <execution>
> <id>javacc</id>
> <goals>
> @@ -96,5 +74,5 @@
> </plugin>
> </plugins>
> </build>
> -
> +
> </project>
>
> Modified: activemq/sandbox/activemq-flow/activemq-spring/pom.xml
> URL:
> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-spring/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>
> ==============================================================================
> --- activemq/sandbox/activemq-flow/activemq-spring/pom.xml (original)
> +++ activemq/sandbox/activemq-flow/activemq-spring/pom.xml Sat Jun 20
> 08:15:30 2009
> @@ -95,7 +95,6 @@
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-surefire-plugin</artifactId>
> - <version>${org-apache-maven-surefire-plugin-version}</version>
> <configuration>
> <excludes>
> <exclude>**/SpringTest.java</exclude>
>
> Modified: activemq/sandbox/activemq-flow/kahadb/pom.xml
> URL:
> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/kahadb/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>
> ==============================================================================
> --- activemq/sandbox/activemq-flow/kahadb/pom.xml (original)
> +++ activemq/sandbox/activemq-flow/kahadb/pom.xml Sat Jun 20 08:15:30 2009
> @@ -90,14 +90,6 @@
> </plugin>
> -->
> <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-compiler-plugin</artifactId>
> - <configuration>
> - <source>1.5</source>
> - <target>1.5</target>
> - </configuration>
> - </plugin>
> - <plugin>
> <artifactId>maven-surefire-plugin</artifactId>
> <configuration>
> <forkMode>pertest</forkMode>
>
> Modified: activemq/sandbox/activemq-flow/pom.xml
> URL:
> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>
> ==============================================================================
> --- activemq/sandbox/activemq-flow/pom.xml (original)
> +++ activemq/sandbox/activemq-flow/pom.xml Sat Jun 20 08:15:30 2009
> @@ -14,11 +14,12 @@
> 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> +-->
> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> <parent>
> <groupId>org.apache</groupId>
> <artifactId>apache</artifactId>
> - <version>4</version>
> + <version>6</version>
> </parent>
> <modelVersion>4.0.0</modelVersion>
>
> @@ -27,6 +28,7 @@
> <version>6.0-SNAPSHOT</version>
> <packaging>pom</packaging>
> <name>ActiveMQ POM</name>
> + <inceptionYear>2005</inceptionYear>
>
> <properties>
> <activemq-version>6.0-SNAPSHOT</activemq-version>
> @@ -65,32 +67,30 @@
> <junit-version>4.4</junit-version>
> <jxta-version>2.0</jxta-version>
> <log4j-version>1.2.14</log4j-version>
> - <nlog4j-version>1.2.25</nlog4j-version>
> + <nlog4j-version>1.5.2</nlog4j-version>
> <org-apache-derby-version>10.1.3.1</org-apache-derby-version>
> -
> <org-apache-maven-surefire-plugin-version>2.3</org-apache-maven-surefire-plugin-version>
> <p2psockets-version>1.1.2</p2psockets-version>
> <regexp-version>1.3</regexp-version>
> <rome-version>0.8</rome-version>
> <slf4j-version>1.5.0</slf4j-version>
> -
> +
> <jaxb-api-version>2.1</jaxb-api-version>
> <jaxb-version>2.1.6</jaxb-version>
> <xjc-version>2.1.10.1</xjc-version>
> <stax-api-version>1.0.1</stax-api-version>
> <stax-version>1.2.0</stax-version>
> -
> +
> <xalan-version>2.6.0</xalan-version>
> <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
> <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
> <xstream-version>1.3.1</xstream-version>
> <xbean-version>3.4</xbean-version>
> <felix-version>1.0.0</felix-version>
> - <dist-repo-url>scpexe://
> people.apache.org/www/people.apache.org/repo/m2-incubating-repository
> </dist-repo-url>
> <site-repo-url>scpexe://
> people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
> </properties>
> -
> +
> <prerequisites>
> - <maven>2.0.8</maven>
> + <maven>2.0.10</maven>
> </prerequisites>
>
> <url>http://activemq.apache.org</url>
> @@ -126,7 +126,8 @@
> <module>activemq-transport</module>
> <module>activemq-util</module>
> <module>kahadb</module>
> - <module>activemq-protobuf</module>
> + <module>activemq-protobuf/activemq-protobuf</module>
> + <module>activemq-protobuf/activemq-protobuf-test</module>
> <module>activemq-client</module>
> <module>activemq-network</module>
> <module>activemq-all</module>
> @@ -139,13 +140,11 @@
> -->
> </modules>
>
> -<!--
> <scm>
> - <connection>scm:svn:https://svn.apache.org/repos/asf/activemq/trunk
> </connection>
> - <developerConnection>scm:svn:
> https://svn.apache.org/repos/asf/activemq/trunk</developerConnection>
> - <url>http://svn.apache.org/viewvc/activemq/trunk/</url>
> + <connection>scm:svn:
> https://svn.apache.org/repos/asf/activemq/sandbox/activemq-flow
> </connection>
> + <developerConnection>scm:svn:
> https://svn.apache.org/repos/asf/activemq/sandbox/activemq-flow
> </developerConnection>
> + <url>http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/
> </url>
> </scm>
> --->
>
> <!-- This is only here since the activemq-protobuf plugin has not been
> released yet -->
> <pluginRepositories>
> @@ -157,25 +156,15 @@
> <id>elca-services</id>
> <url>http://el4.elca-services.ch/el4j/maven2repository</url>
> <releases>
> - <enabled>true</enabled>
> + <enabled>true</enabled>
> </releases>
> </pluginRepository>
> </pluginRepositories>
> -
> - <repositories>
> - <repository>
> - <id>apache.snapshots</id>
> - <url>https://repository.apache.org/content/repositories/snapshots/
> </url>
> - <releases>
> - <enabled>false</enabled>
> - </releases>
> - </repository>
> - </repositories>
>
> <dependencyManagement>
> <dependencies>
> <!-- =============================== -->
> - <!-- ActiveMQ Dependencies -->
> + <!-- Internal ActiveMQ Dependencies -->
> <!-- =============================== -->
> <dependency>
> <groupId>org.apache.activemq</groupId>
> @@ -206,7 +195,7 @@
> <groupId>org.apache.activemq</groupId>
> <artifactId>kahadb</artifactId>
> <version>${activemq-version}</version>
> - </dependency>
> + </dependency>
> <dependency>
> <groupId>org.apache.activemq</groupId>
> <artifactId>activemq-bio</artifactId>
> @@ -267,7 +256,7 @@
> <artifactId>activemq-spring</artifactId>
> <version>${activemq-version}</version>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.activemq.protobuf</groupId>
> <artifactId>activemq-protobuf</artifactId>
> @@ -379,7 +368,7 @@
> <version>${camel-version}</version>
> <type>war</type>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.hadoop.zookeeper</groupId>
> <artifactId>zookeeper</artifactId>
> @@ -414,7 +403,7 @@
> <groupId>com.sun.xml.bind</groupId>
> <artifactId>jaxb-xjc</artifactId>
> <version>${xjc-version}</version>
> - </dependency>
> + </dependency>
>
> <!-- camel testing -->
> <dependency>
> @@ -482,7 +471,7 @@
> <artifactId>spring-aop</artifactId>
> <version>${spring-version}</version>
> <optional>true</optional>
> - </dependency>
> + </dependency>
> <dependency>
> <groupId>org.springframework</groupId>
> <artifactId>spring-beans</artifactId>
> @@ -506,14 +495,14 @@
> <artifactId>spring-jms</artifactId>
> <version>${spring-version}</version>
> <optional>true</optional>
> - </dependency>
> + </dependency>
> <dependency>
> <groupId>org.springframework</groupId>
> <artifactId>spring-tx</artifactId>
> <version>${spring-version}</version>
> <optional>true</optional>
> - </dependency>
> -
> + </dependency>
> +
> <dependency>
> <groupId>org.springframework</groupId>
> <artifactId>spring-webmvc</artifactId>
> @@ -815,16 +804,16 @@
>
>
> <dependency>
> - <groupId>org.apache.servicemix.kernel</groupId>
> - <artifactId>apache-servicemix-kernel</artifactId>
> - <version>${servicemix.kernel.version}</version>
> - <type>zip</type>
> + <groupId>org.apache.servicemix.kernel</groupId>
> + <artifactId>apache-servicemix-kernel</artifactId>
> + <version>${servicemix.kernel.version}</version>
> + <type>zip</type>
> </dependency>
> <dependency>
> - <groupId>org.apache.servicemix.kernel</groupId>
> - <artifactId>apache-servicemix-kernel</artifactId>
> - <version>${servicemix.kernel.version}</version>
> - <type>tar.gz</type>
> + <groupId>org.apache.servicemix.kernel</groupId>
> + <artifactId>apache-servicemix-kernel</artifactId>
> + <version>${servicemix.kernel.version}</version>
> + <type>tar.gz</type>
> </dependency>
>
> </dependencies>
> @@ -842,7 +831,7 @@
> <groupId>ch.elca.el4j.maven.plugins</groupId>
> <artifactId>maven-depgraph-plugin</artifactId>
> <version>1.7</version>
> - </plugin>
> + </plugin>
> <plugin>
> <groupId>org.apache.servicemix.tooling</groupId>
> <artifactId>features-maven-plugin</artifactId>
> @@ -861,89 +850,25 @@
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-assembly-plugin</artifactId>
> - <version>2.2-beta-2</version>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-compiler-plugin</artifactId>
> - <version>2.0.2</version>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-eclipse-plugin</artifactId>
> - <version>2.4</version>
> + <version>2.2-beta-4</version>
> <configuration>
> - <downloadSources>true</downloadSources>
> - <downloadJavadocs>true</downloadJavadocs>
> + <tarLongFileMode>gnu</tarLongFileMode>
> </configuration>
> </plugin>
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-gpg-plugin</artifactId>
> - <version>1.0-alpha-4</version>
> - <executions>
> - <execution>
> - <goals>
> - <goal>sign</goal>
> - </goals>
> - </execution>
> - </executions>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-install-plugin</artifactId>
> - <version>2.2</version>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-jar-plugin</artifactId>
> - <version>2.2</version>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-javadoc-plugin</artifactId>
> - <version>2.4</version>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-release-plugin</artifactId>
> - <version>2.0-beta-7</version>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-remote-resources-plugin</artifactId>
> - <version>1.0</version>
> - <executions>
> - <execution>
> - <goals>
> - <goal>process</goal>
> - </goals>
> - <configuration>
> - <properties>
> - <projectName>${projectName}</projectName>
> - </properties>
> - <resourceBundles>
> -
> <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
> - </resourceBundles>
> - </configuration>
> - </execution>
> - </executions>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-source-plugin</artifactId>
> - <version>2.0.4</version>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-stage-plugin</artifactId>
> <version>1.0-alpha-1</version>
> </plugin>
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-surefire-plugin</artifactId>
> - <version>${org-apache-maven-surefire-plugin-version}</version>
> <configuration>
> + <redirectTestOutputToFile>true</redirectTestOutputToFile>
> + <forkMode>once</forkMode>
> + <argLine>-enableassertions</argLine>
> + <failIfNoTests>false</failIfNoTests>
> +
> <workingDirectory>${project.build.directory}</workingDirectory>
> <includes>
> <include>**/*Test.java</include>
> <include>**/*TestCase.java</include>
> @@ -961,9 +886,9 @@
> <version>${felix-version}</version>
> </plugin>
> <plugin>
> - <groupId>org.apache.geronimo.genesis.plugins</groupId>
> - <artifactId>tools-maven-plugin</artifactId>
> - <version>1.4</version>
> + <groupId>org.codehaus.mojo</groupId>
> + <artifactId>ianal-maven-plugin</artifactId>
> + <version>1.0-alpha-1</version>
> </plugin>
> <plugin>
> <groupId>org.codehaus.mojo</groupId>
> @@ -1005,90 +930,66 @@
> </plugin>
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-jar-plugin</artifactId>
> - <configuration>
> - <archive>
> - <index>true</index>
> - <compress>true</compress>
> - </archive>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.felix</groupId>
> - <artifactId>maven-bundle-plugin</artifactId>
> - <version>${felix-version}</version>
> - <extensions>true</extensions>
> - <configuration>
> - <instructions>
> - <Bundle-Name>${artifactId}</Bundle-Name>
> - <Bundle-SymbolicName>${activemq.osgi.symbolic.name
> }</Bundle-SymbolicName>
> - <Export-Package>${activemq.osgi.export}</Export-Package>
> - <Import-Package>${activemq.osgi.import}</Import-Package>
> -
> <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
> - <Implementation-Title>Apache ActiveMQ</Implementation-Title>
> -
> <Implementation-Version>${project.version}</Implementation-Version>
> - </instructions>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-compiler-plugin</artifactId>
> <configuration>
> <source>1.5</source>
> <target>1.5</target>
> + <optimize>true</optimize>
> + <debug>true</debug>
> + <showDeprecation>true</showDeprecation>
> + <showWarnings>true</showWarnings>
> </configuration>
> </plugin>
> +
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-surefire-plugin</artifactId>
> - <configuration>
> - <forkMode>once</forkMode>
> - <redirectTestOutputToFile>true</redirectTestOutputToFile>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-eclipse-plugin</artifactId>
> - <configuration>
> - <outputDirectory>${basedir}/eclipse-classes</outputDirectory>
> - </configuration>
> + <artifactId>maven-enforcer-plugin</artifactId>
> + <executions>
> + <execution>
> + <phase>validate</phase>
> + <goals>
> + <goal>enforce</goal>
> + </goals>
> + <configuration>
> + <rules>
> + <requireMavenVersion>
> + <version>[2.0.10,)</version>
> + </requireMavenVersion>
> + </rules>
> + </configuration>
> + </execution>
> + </executions>
> </plugin>
> <plugin>
> <groupId>org.codehaus.mojo</groupId>
> - <artifactId>rat-maven-plugin</artifactId>
> - </plugin>
> -
> - <plugin>
> - <groupId>org.apache.geronimo.genesis.plugins</groupId>
> - <artifactId>tools-maven-plugin</artifactId>
> + <artifactId>ianal-maven-plugin</artifactId>
> <executions>
> <execution>
> - <id>verify-legal-files</id>
> - <phase>verify</phase>
> <goals>
> <goal>verify-legal-files</goal>
> </goals>
> <configuration>
> - <!-- Fail the build if no legal files were found -->
> <strict>true</strict>
> </configuration>
> </execution>
> </executions>
> </plugin>
> -
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-remote-resources-plugin</artifactId>
> - </plugin>
> -
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-stage-plugin</artifactId>
> - </plugin>
> -
> <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-release-plugin</artifactId>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <version>${felix-version}</version>
> + <extensions>true</extensions>
> + <configuration>
> + <instructions>
> + <Bundle-Name>${artifactId}</Bundle-Name>
> + <Bundle-SymbolicName>${activemq.osgi.symbolic.name
> }</Bundle-SymbolicName>
> + <Export-Package>${activemq.osgi.export}</Export-Package>
> + <Import-Package>${activemq.osgi.import}</Import-Package>
> +
> <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
> + <Implementation-Title>Apache ActiveMQ</Implementation-Title>
> +
> <Implementation-Version>${project.version}</Implementation-Version>
> + </instructions>
> + </configuration>
> </plugin>
> </plugins>
> </build>
> @@ -1141,7 +1042,8 @@
> <link>http://junit.sourceforge.net/javadoc/</link>
> <link>http://logging.apache.org/log4j/docs/api/</link>
> </links>
> -
> <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
> + <!-- the stylesheet is missing from activemq 6. This kind of
> cross-project file reference is a bad idea -->
> +
> <!--<stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>-->
> <linksource>true</linksource>
> <maxmemory>900m</maxmemory>
> <source>1.5</source>
> @@ -1165,97 +1067,44 @@
> <profiles>
>
> <profile>
> - <id>release</id>
> -
> + <id>apache-release</id>
> + <activation>
> + <property>
> + <name>apache-release</name>
> + </property>
> + </activation>
> <build>
> <plugins>
> -
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-surefire-plugin</artifactId>
> - <configuration>
> - <test>false</test>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-release-plugin</artifactId>
> - <configuration>
> - <useReleaseProfile>false</useReleaseProfile>
> - <goals>deploy</goals>
> - <arguments>-Prelease</arguments>
> - <autoVersionSubmodules>true</autoVersionSubmodules>
> - </configuration>
> - </plugin>
> -
> - <!-- We want a source jar -->
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-source-plugin</artifactId>
> - <executions>
> - <execution>
> - <goals>
> - <goal>jar</goal>
> - </goals>
> - </execution>
> - </executions>
> - </plugin>
> -
> - <!-- We want to sign the artifact, the POM, and all attached
> artifacts -->
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-gpg-plugin</artifactId>
> - <inherited>true</inherited>
> - <configuration>
> - <passphrase>${gpg.passphrase}</passphrase>
> - </configuration>
> + <artifactId>maven-assembly-plugin</artifactId>
> <executions>
> <execution>
> <goals>
> - <goal>sign</goal>
> + <goal>single</goal>
> </goals>
> + <phase>package</phase>
> + <configuration>
> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
> + <descriptorRefs>
> + <descriptorRef>
> + source-release
> + </descriptorRef>
> + </descriptorRefs>
> + </configuration>
> </execution>
> </executions>
> + <dependencies>
> + <dependency>
> + <!-- apache version not yet released -->
> + <!--<groupId>org.apache</groupId>-->
> + <groupId>org.apache.geronimo.genesis</groupId>
> +
> <artifactId>apache-source-release-assembly-descriptor</artifactId>
> + <!-- apache version not yet known -->
> + <version>2.0</version>
> + </dependency>
> + </dependencies>
> </plugin>
> -
> - <!-- We want to deploy the artifact to a staging location for
> perusal -->
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-deploy-plugin</artifactId>
> - <inherited>true</inherited>
> - <configuration>
> -
> <altDeploymentRepository>${staging.altRepository}/${siteId}</altDeploymentRepository>
> - <updateReleaseInfo>true</updateReleaseInfo>
> - </configuration>
> - </plugin>
> -
> - <!-- We want the JavaDoc JAR published with the release -->
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-javadoc-plugin</artifactId>
> - <inherited>true</inherited>
> - <configuration>
> - <source>1.5</source>
> - </configuration>
> - <executions>
> - <execution>
> - <id>attach-javadocs</id>
> - <goals>
> - <goal>jar</goal>
> - </goals>
> - </execution>
> - </executions>
> - </plugin>
> - </plugins>
> - </build>
> - </profile>
> -
> - <profile>
> - <id>full</id>
> -
> - <build>
> - <plugins>
> -
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-surefire-plugin</artifactId>
> @@ -1263,37 +1112,6 @@
> <test>false</test>
> </configuration>
> </plugin>
> -
> - <!-- We want a source jar -->
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-source-plugin</artifactId>
> - <executions>
> - <execution>
> - <goals>
> - <goal>jar</goal>
> - </goals>
> - </execution>
> - </executions>
> - </plugin>
> -
> - <!-- We want the JavaDoc JAR published with the release -->
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-javadoc-plugin</artifactId>
> - <inherited>true</inherited>
> - <configuration>
> - <source>1.5</source>
> - </configuration>
> - <executions>
> - <execution>
> - <id>attach-javadocs</id>
> - <goals>
> - <goal>jar</goal>
> - </goals>
> - </execution>
> - </executions>
> - </plugin>
> </plugins>
> </build>
> </profile>
>
>
>
--
Regards,
Hiram
Blog: http://hiramchirino.com
Open Source SOA
http://fusesource.com/
Re: svn commit: r786768 - in /activemq/sandbox/activemq-flow: ./ activemq-broker/ activemq-network/ activemq-protobuf/activemq-protobuf-test/ activemq-protobuf/activemq-protobuf/ activemq-spring/ kahadb/
Posted by David Jencks <da...@yahoo.com>.
On Jun 22, 2009, at 10:37 AM, Hiram Chirino wrote:
> David,
>
> Is there a reason for taking out the eclipse plugin config?
I can put it back if you want, my experience with eclipse is that
m2eclipse works a lot better than the eclipse plugin and that non-
standard configuration usually is obsolete.
thanks
david jencks
>
> On Sat, Jun 20, 2009 at 4:15 AM, <dj...@apache.org> wrote:
>
>> Author: djencks
>> Date: Sat Jun 20 08:15:30 2009
>> New Revision: 786768
>>
>> URL: http://svn.apache.org/viewvc?rev=786768&view=rev
>> Log:
>> ACTIVEMQ-2297 update to nexus, apache 6 pom, etc. Protobuf needs more
>> attention
>>
>> Added:
>> activemq/sandbox/activemq-flow/LICENSE
>> activemq/sandbox/activemq-flow/NOTICE
>> Modified:
>> activemq/sandbox/activemq-flow/activemq-broker/pom.xml
>> activemq/sandbox/activemq-flow/activemq-network/pom.xml
>>
>> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf-
>> test/pom.xml
>>
>> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf/
>> pom.xml
>> activemq/sandbox/activemq-flow/activemq-spring/pom.xml
>> activemq/sandbox/activemq-flow/kahadb/pom.xml
>> activemq/sandbox/activemq-flow/pom.xml
>>
>> Added: activemq/sandbox/activemq-flow/LICENSE
>> URL:
>> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/LICENSE?rev=786768&view=auto
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- activemq/sandbox/activemq-flow/LICENSE (added)
>> +++ activemq/sandbox/activemq-flow/LICENSE Sat Jun 20 08:15:30 2009
>> @@ -0,0 +1,202 @@
>> +
>> + 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: activemq/sandbox/activemq-flow/NOTICE
>> URL:
>> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/NOTICE?rev=786768&view=auto
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- activemq/sandbox/activemq-flow/NOTICE (added)
>> +++ activemq/sandbox/activemq-flow/NOTICE Sat Jun 20 08:15:30 2009
>> @@ -0,0 +1,8 @@
>> +
>> +ActiveMQ
>> +Copyright 2005-2009 The Apache Software Foundation
>> +
>> +This product includes software developed at
>> +The Apache Software Foundation (http://www.apache.org/).
>> +
>> +
>>
>> Modified: activemq/sandbox/activemq-flow/activemq-broker/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- activemq/sandbox/activemq-flow/activemq-broker/pom.xml (original)
>> +++ activemq/sandbox/activemq-flow/activemq-broker/pom.xml Sat Jun 20
>> 08:15:30 2009
>> @@ -37,11 +37,11 @@
>> <name>Java.net Maven Repository </name>
>> <url>http://download.java.net/maven/2</url>
>> </repository>
>> - <repository>
>> - <id>codehaus</id>
>> - <name>Codehaus Maven 2 Repository</name>
>> - <url>http://repository.codehaus.org/</url>
>> - </repository>
>> + <!--<repository>-->
>> + <!--<id>codehaus</id>-->
>> + <!--<name>Codehaus Maven 2 Repository</name>-->
>> + <!--<url>http://repository.codehaus.org/</url>-->
>> + <!--</repository>-->
>> </repositories>
>>
>> <pluginRepositories>
>>
>> Modified: activemq/sandbox/activemq-flow/activemq-network/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- activemq/sandbox/activemq-flow/activemq-network/pom.xml
>> (original)
>> +++ activemq/sandbox/activemq-flow/activemq-network/pom.xml Sat Jun
>> 20
>> 08:15:30 2009
>> @@ -71,7 +71,6 @@
>> <plugin>
>> <groupId>org.apache.maven.plugins</groupId>
>> <artifactId>maven-surefire-plugin</artifactId>
>> - <version>${org-apache-maven-surefire-plugin-version}</
>> version>
>> <configuration>
>> <excludes>
>> <!-- Disable all the tests for now -->
>>
>> Modified:
>> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf-
>> test/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf-test/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> ---
>> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf-
>> test/pom.xml
>> (original)
>> +++
>> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf-
>> test/pom.xml
>> Sat Jun 20 08:15:30 2009
>> @@ -19,9 +19,9 @@
>> <modelVersion>4.0.0</modelVersion>
>>
>> <parent>
>> - <groupId>org.apache.activemq.protobuf</groupId>
>> - <artifactId>activemq-protobuf-pom</artifactId>
>> - <version>1.1-SNAPSHOT</version>
>> + <groupId>org.apache.activemq</groupId>
>> + <artifactId>activemq-parent</artifactId>
>> + <version>6.0-SNAPSHOT</version>
>> </parent>
>>
>> <groupId>org.apache.activemq.protobuf</groupId>
>> @@ -35,7 +35,6 @@
>> <dependency>
>> <groupId>junit</groupId>
>> <artifactId>junit</artifactId>
>> - <version>4.4</version>
>> <scope>test</scope>
>> </dependency>
>> <dependency>
>> @@ -48,21 +47,6 @@
>> <build>
>> <plugins>
>> <plugin>
>> - <artifactId>maven-compiler-plugin</artifactId>
>> - <configuration>
>> - <source>1.5</source>
>> - <target>1.5</target>
>> - </configuration>
>> - </plugin>
>> - <plugin>
>> - <artifactId>maven-surefire-plugin</artifactId>
>> - <configuration>
>> - <includes>
>> - <include>**/*Test.java</include>
>> - </includes>
>> - </configuration>
>> - </plugin>
>> - <plugin>
>> <groupId>org.apache.activemq.protobuf</groupId>
>> <artifactId>activemq-protobuf</artifactId>
>> <version>1.1-SNAPSHOT</version>
>>
>> Modified:
>> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf/
>> pom.xml
>> URL:
>> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> ---
>> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf/
>> pom.xml
>> (original)
>> +++
>> activemq/sandbox/activemq-flow/activemq-protobuf/activemq-protobuf/
>> pom.xml
>> Sat Jun 20 08:15:30 2009
>> @@ -16,33 +16,33 @@
>> limitations under the License.
>> -->
>> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
>> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
>> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
>> ">
>> -
>> +
>> <modelVersion>4.0.0</modelVersion>
>> <parent>
>> - <groupId>org.apache.activemq.protobuf</groupId>
>> - <artifactId>activemq-protobuf-pom</artifactId>
>> - <version>1.1-SNAPSHOT</version>
>> + <groupId>org.apache.activemq</groupId>
>> + <artifactId>activemq-parent</artifactId>
>> + <version>6.0-SNAPSHOT</version>
>> </parent>
>>
>> <groupId>org.apache.activemq.protobuf</groupId>
>> <artifactId>activemq-protobuf</artifactId>
>> <version>1.1-SNAPSHOT</version>
>> <packaging>maven-plugin</packaging>
>> -
>> +
>> <name>ActiveMQ Protocol Buffers Implementation and Compiler</name>
>>
>> <description>
>> - A Simpler Protocol Buffer Java API. Includes a Proto to Java
>> compiler.
>> + A Simpler Protocol Buffer Java API. Includes a Proto to Java
>> compiler.
>> </description>
>>
>> <dependencies>
>> -
>> +
>> <dependency>
>> <groupId>org.apache.activemq</groupId>
>> <artifactId>activemq-util</artifactId>
>> <version>6.0-SNAPSHOT</version>
>> </dependency>
>> -
>> +
>> <dependency>
>> <groupId>org.apache.maven</groupId>
>> <artifactId>maven-plugin-api</artifactId>
>> @@ -55,37 +55,15 @@
>> <version>2.0</version>
>> <optional>true</optional>
>> </dependency>
>> -
>> - <dependency>
>> - <groupId>junit</groupId>
>> - <artifactId>junit</artifactId>
>> - <version>4.4</version>
>> - <scope>test</scope>
>> - </dependency>
>> </dependencies>
>> -
>> +
>> <build>
>> <plugins>
>> <plugin>
>> - <artifactId>maven-compiler-plugin</artifactId>
>> - <configuration>
>> - <source>1.5</source>
>> - <target>1.5</target>
>> - </configuration>
>> - </plugin>
>> - <plugin>
>> - <artifactId>maven-surefire-plugin</artifactId>
>> - <configuration>
>> - <includes>
>> - <include>**/*Test.java</include>
>> - </includes>
>> - </configuration>
>> - </plugin>
>> - <plugin>
>> <groupId>org.codehaus.mojo</groupId>
>> <artifactId>javacc-maven-plugin</artifactId>
>> <version>2.4.1</version>
>> - <executions>
>> + <executions>
>> <execution>
>> <id>javacc</id>
>> <goals>
>> @@ -96,5 +74,5 @@
>> </plugin>
>> </plugins>
>> </build>
>> -
>> +
>> </project>
>>
>> Modified: activemq/sandbox/activemq-flow/activemq-spring/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-spring/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- activemq/sandbox/activemq-flow/activemq-spring/pom.xml (original)
>> +++ activemq/sandbox/activemq-flow/activemq-spring/pom.xml Sat Jun 20
>> 08:15:30 2009
>> @@ -95,7 +95,6 @@
>> <plugin>
>> <groupId>org.apache.maven.plugins</groupId>
>> <artifactId>maven-surefire-plugin</artifactId>
>> - <version>${org-apache-maven-surefire-plugin-version}</
>> version>
>> <configuration>
>> <excludes>
>> <exclude>**/SpringTest.java</exclude>
>>
>> Modified: activemq/sandbox/activemq-flow/kahadb/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/kahadb/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- activemq/sandbox/activemq-flow/kahadb/pom.xml (original)
>> +++ activemq/sandbox/activemq-flow/kahadb/pom.xml Sat Jun 20
>> 08:15:30 2009
>> @@ -90,14 +90,6 @@
>> </plugin>
>> -->
>> <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-compiler-plugin</artifactId>
>> - <configuration>
>> - <source>1.5</source>
>> - <target>1.5</target>
>> - </configuration>
>> - </plugin>
>> - <plugin>
>> <artifactId>maven-surefire-plugin</artifactId>
>> <configuration>
>> <forkMode>pertest</forkMode>
>>
>> Modified: activemq/sandbox/activemq-flow/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/pom.xml?rev=786768&r1=786767&r2=786768&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- activemq/sandbox/activemq-flow/pom.xml (original)
>> +++ activemq/sandbox/activemq-flow/pom.xml Sat Jun 20 08:15:30 2009
>> @@ -14,11 +14,12 @@
>> 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
>> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
>> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
>> ">
>> +-->
>> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
>> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
>> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
>> ">
>> <parent>
>> <groupId>org.apache</groupId>
>> <artifactId>apache</artifactId>
>> - <version>4</version>
>> + <version>6</version>
>> </parent>
>> <modelVersion>4.0.0</modelVersion>
>>
>> @@ -27,6 +28,7 @@
>> <version>6.0-SNAPSHOT</version>
>> <packaging>pom</packaging>
>> <name>ActiveMQ POM</name>
>> + <inceptionYear>2005</inceptionYear>
>>
>> <properties>
>> <activemq-version>6.0-SNAPSHOT</activemq-version>
>> @@ -65,32 +67,30 @@
>> <junit-version>4.4</junit-version>
>> <jxta-version>2.0</jxta-version>
>> <log4j-version>1.2.14</log4j-version>
>> - <nlog4j-version>1.2.25</nlog4j-version>
>> + <nlog4j-version>1.5.2</nlog4j-version>
>> <org-apache-derby-version>10.1.3.1</org-apache-derby-version>
>> -
>> <org-apache-maven-surefire-plugin-version>2.3</org-apache-maven-
>> surefire-plugin-version>
>> <p2psockets-version>1.1.2</p2psockets-version>
>> <regexp-version>1.3</regexp-version>
>> <rome-version>0.8</rome-version>
>> <slf4j-version>1.5.0</slf4j-version>
>> -
>> +
>> <jaxb-api-version>2.1</jaxb-api-version>
>> <jaxb-version>2.1.6</jaxb-version>
>> <xjc-version>2.1.10.1</xjc-version>
>> <stax-api-version>1.0.1</stax-api-version>
>> <stax-version>1.2.0</stax-version>
>> -
>> +
>> <xalan-version>2.6.0</xalan-version>
>> <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
>> <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
>> <xstream-version>1.3.1</xstream-version>
>> <xbean-version>3.4</xbean-version>
>> <felix-version>1.0.0</felix-version>
>> - <dist-repo-url>scpexe://
>> people.apache.org/www/people.apache.org/repo/m2-incubating-repository
>> </dist-repo-url>
>> <site-repo-url>scpexe://
>> people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
>> </properties>
>> -
>> +
>> <prerequisites>
>> - <maven>2.0.8</maven>
>> + <maven>2.0.10</maven>
>> </prerequisites>
>>
>> <url>http://activemq.apache.org</url>
>> @@ -126,7 +126,8 @@
>> <module>activemq-transport</module>
>> <module>activemq-util</module>
>> <module>kahadb</module>
>> - <module>activemq-protobuf</module>
>> + <module>activemq-protobuf/activemq-protobuf</module>
>> + <module>activemq-protobuf/activemq-protobuf-test</module>
>> <module>activemq-client</module>
>> <module>activemq-network</module>
>> <module>activemq-all</module>
>> @@ -139,13 +140,11 @@
>> -->
>> </modules>
>>
>> -<!--
>> <scm>
>> - <connection>scm:svn:https://svn.apache.org/repos/asf/activemq/trunk
>> </connection>
>> - <developerConnection>scm:svn:
>> https://svn.apache.org/repos/asf/activemq/trunk</developerConnection>
>> - <url>http://svn.apache.org/viewvc/activemq/trunk/</url>
>> + <connection>scm:svn:
>> https://svn.apache.org/repos/asf/activemq/sandbox/activemq-flow
>> </connection>
>> + <developerConnection>scm:svn:
>> https://svn.apache.org/repos/asf/activemq/sandbox/activemq-flow
>> </developerConnection>
>> + <url>http://svn.apache.org/viewvc/activemq/sandbox/activemq-
>> flow/
>> </url>
>> </scm>
>> --->
>>
>> <!-- This is only here since the activemq-protobuf plugin has not
>> been
>> released yet -->
>> <pluginRepositories>
>> @@ -157,25 +156,15 @@
>> <id>elca-services</id>
>> <url>http://el4.elca-services.ch/el4j/maven2repository</url>
>> <releases>
>> - <enabled>true</enabled>
>> + <enabled>true</enabled>
>> </releases>
>> </pluginRepository>
>> </pluginRepositories>
>> -
>> - <repositories>
>> - <repository>
>> - <id>apache.snapshots</id>
>> - <url>https://repository.apache.org/content/repositories/snapshots/
>> </url>
>> - <releases>
>> - <enabled>false</enabled>
>> - </releases>
>> - </repository>
>> - </repositories>
>>
>> <dependencyManagement>
>> <dependencies>
>> <!-- =============================== -->
>> - <!-- ActiveMQ Dependencies -->
>> + <!-- Internal ActiveMQ Dependencies -->
>> <!-- =============================== -->
>> <dependency>
>> <groupId>org.apache.activemq</groupId>
>> @@ -206,7 +195,7 @@
>> <groupId>org.apache.activemq</groupId>
>> <artifactId>kahadb</artifactId>
>> <version>${activemq-version}</version>
>> - </dependency>
>> + </dependency>
>> <dependency>
>> <groupId>org.apache.activemq</groupId>
>> <artifactId>activemq-bio</artifactId>
>> @@ -267,7 +256,7 @@
>> <artifactId>activemq-spring</artifactId>
>> <version>${activemq-version}</version>
>> </dependency>
>> -
>> +
>> <dependency>
>> <groupId>org.apache.activemq.protobuf</groupId>
>> <artifactId>activemq-protobuf</artifactId>
>> @@ -379,7 +368,7 @@
>> <version>${camel-version}</version>
>> <type>war</type>
>> </dependency>
>> -
>> +
>> <dependency>
>> <groupId>org.apache.hadoop.zookeeper</groupId>
>> <artifactId>zookeeper</artifactId>
>> @@ -414,7 +403,7 @@
>> <groupId>com.sun.xml.bind</groupId>
>> <artifactId>jaxb-xjc</artifactId>
>> <version>${xjc-version}</version>
>> - </dependency>
>> + </dependency>
>>
>> <!-- camel testing -->
>> <dependency>
>> @@ -482,7 +471,7 @@
>> <artifactId>spring-aop</artifactId>
>> <version>${spring-version}</version>
>> <optional>true</optional>
>> - </dependency>
>> + </dependency>
>> <dependency>
>> <groupId>org.springframework</groupId>
>> <artifactId>spring-beans</artifactId>
>> @@ -506,14 +495,14 @@
>> <artifactId>spring-jms</artifactId>
>> <version>${spring-version}</version>
>> <optional>true</optional>
>> - </dependency>
>> + </dependency>
>> <dependency>
>> <groupId>org.springframework</groupId>
>> <artifactId>spring-tx</artifactId>
>> <version>${spring-version}</version>
>> <optional>true</optional>
>> - </dependency>
>> -
>> + </dependency>
>> +
>> <dependency>
>> <groupId>org.springframework</groupId>
>> <artifactId>spring-webmvc</artifactId>
>> @@ -815,16 +804,16 @@
>>
>>
>> <dependency>
>> - <groupId>org.apache.servicemix.kernel</groupId>
>> - <artifactId>apache-servicemix-kernel</artifactId>
>> - <version>${servicemix.kernel.version}</version>
>> - <type>zip</type>
>> + <groupId>org.apache.servicemix.kernel</groupId>
>> + <artifactId>apache-servicemix-kernel</artifactId>
>> + <version>${servicemix.kernel.version}</version>
>> + <type>zip</type>
>> </dependency>
>> <dependency>
>> - <groupId>org.apache.servicemix.kernel</groupId>
>> - <artifactId>apache-servicemix-kernel</artifactId>
>> - <version>${servicemix.kernel.version}</version>
>> - <type>tar.gz</type>
>> + <groupId>org.apache.servicemix.kernel</groupId>
>> + <artifactId>apache-servicemix-kernel</artifactId>
>> + <version>${servicemix.kernel.version}</version>
>> + <type>tar.gz</type>
>> </dependency>
>>
>> </dependencies>
>> @@ -842,7 +831,7 @@
>> <groupId>ch.elca.el4j.maven.plugins</groupId>
>> <artifactId>maven-depgraph-plugin</artifactId>
>> <version>1.7</version>
>> - </plugin>
>> + </plugin>
>> <plugin>
>> <groupId>org.apache.servicemix.tooling</groupId>
>> <artifactId>features-maven-plugin</artifactId>
>> @@ -861,89 +850,25 @@
>> <plugin>
>> <groupId>org.apache.maven.plugins</groupId>
>> <artifactId>maven-assembly-plugin</artifactId>
>> - <version>2.2-beta-2</version>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-compiler-plugin</artifactId>
>> - <version>2.0.2</version>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-eclipse-plugin</artifactId>
>> - <version>2.4</version>
>> + <version>2.2-beta-4</version>
>> <configuration>
>> - <downloadSources>true</downloadSources>
>> - <downloadJavadocs>true</downloadJavadocs>
>> + <tarLongFileMode>gnu</tarLongFileMode>
>> </configuration>
>> </plugin>
>> <plugin>
>> <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-gpg-plugin</artifactId>
>> - <version>1.0-alpha-4</version>
>> - <executions>
>> - <execution>
>> - <goals>
>> - <goal>sign</goal>
>> - </goals>
>> - </execution>
>> - </executions>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-install-plugin</artifactId>
>> - <version>2.2</version>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-jar-plugin</artifactId>
>> - <version>2.2</version>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-javadoc-plugin</artifactId>
>> - <version>2.4</version>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-release-plugin</artifactId>
>> - <version>2.0-beta-7</version>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-remote-resources-plugin</artifactId>
>> - <version>1.0</version>
>> - <executions>
>> - <execution>
>> - <goals>
>> - <goal>process</goal>
>> - </goals>
>> - <configuration>
>> - <properties>
>> - <projectName>${projectName}</projectName>
>> - </properties>
>> - <resourceBundles>
>> -
>> <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</
>> resourceBundle>
>> - </resourceBundles>
>> - </configuration>
>> - </execution>
>> - </executions>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-source-plugin</artifactId>
>> - <version>2.0.4</version>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> <artifactId>maven-stage-plugin</artifactId>
>> <version>1.0-alpha-1</version>
>> </plugin>
>> <plugin>
>> <groupId>org.apache.maven.plugins</groupId>
>> <artifactId>maven-surefire-plugin</artifactId>
>> - <version>${org-apache-maven-surefire-plugin-version}</
>> version>
>> <configuration>
>> + <redirectTestOutputToFile>true</
>> redirectTestOutputToFile>
>> + <forkMode>once</forkMode>
>> + <argLine>-enableassertions</argLine>
>> + <failIfNoTests>false</failIfNoTests>
>> +
>> <workingDirectory>${project.build.directory}</workingDirectory>
>> <includes>
>> <include>**/*Test.java</include>
>> <include>**/*TestCase.java</include>
>> @@ -961,9 +886,9 @@
>> <version>${felix-version}</version>
>> </plugin>
>> <plugin>
>> - <groupId>org.apache.geronimo.genesis.plugins</groupId>
>> - <artifactId>tools-maven-plugin</artifactId>
>> - <version>1.4</version>
>> + <groupId>org.codehaus.mojo</groupId>
>> + <artifactId>ianal-maven-plugin</artifactId>
>> + <version>1.0-alpha-1</version>
>> </plugin>
>> <plugin>
>> <groupId>org.codehaus.mojo</groupId>
>> @@ -1005,90 +930,66 @@
>> </plugin>
>> <plugin>
>> <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-jar-plugin</artifactId>
>> - <configuration>
>> - <archive>
>> - <index>true</index>
>> - <compress>true</compress>
>> - </archive>
>> - </configuration>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.felix</groupId>
>> - <artifactId>maven-bundle-plugin</artifactId>
>> - <version>${felix-version}</version>
>> - <extensions>true</extensions>
>> - <configuration>
>> - <instructions>
>> - <Bundle-Name>${artifactId}</Bundle-Name>
>> - <Bundle-SymbolicName>${activemq.osgi.symbolic.name
>> }</Bundle-SymbolicName>
>> - <Export-Package>${activemq.osgi.export}</Export-Package>
>> - <Import-Package>${activemq.osgi.import}</Import-Package>
>> -
>> <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
>> - <Implementation-Title>Apache ActiveMQ</Implementation-
>> Title>
>> -
>> <Implementation-Version>${project.version}</Implementation-Version>
>> - </instructions>
>> - </configuration>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> <artifactId>maven-compiler-plugin</artifactId>
>> <configuration>
>> <source>1.5</source>
>> <target>1.5</target>
>> + <optimize>true</optimize>
>> + <debug>true</debug>
>> + <showDeprecation>true</showDeprecation>
>> + <showWarnings>true</showWarnings>
>> </configuration>
>> </plugin>
>> +
>> <plugin>
>> <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-surefire-plugin</artifactId>
>> - <configuration>
>> - <forkMode>once</forkMode>
>> - <redirectTestOutputToFile>true</redirectTestOutputToFile>
>> - </configuration>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-eclipse-plugin</artifactId>
>> - <configuration>
>> - <outputDirectory>${basedir}/eclipse-classes</
>> outputDirectory>
>> - </configuration>
>> + <artifactId>maven-enforcer-plugin</artifactId>
>> + <executions>
>> + <execution>
>> + <phase>validate</phase>
>> + <goals>
>> + <goal>enforce</goal>
>> + </goals>
>> + <configuration>
>> + <rules>
>> + <requireMavenVersion>
>> + <version>[2.0.10,)</version>
>> + </requireMavenVersion>
>> + </rules>
>> + </configuration>
>> + </execution>
>> + </executions>
>> </plugin>
>> <plugin>
>> <groupId>org.codehaus.mojo</groupId>
>> - <artifactId>rat-maven-plugin</artifactId>
>> - </plugin>
>> -
>> - <plugin>
>> - <groupId>org.apache.geronimo.genesis.plugins</groupId>
>> - <artifactId>tools-maven-plugin</artifactId>
>> + <artifactId>ianal-maven-plugin</artifactId>
>> <executions>
>> <execution>
>> - <id>verify-legal-files</id>
>> - <phase>verify</phase>
>> <goals>
>> <goal>verify-legal-files</goal>
>> </goals>
>> <configuration>
>> - <!-- Fail the build if no legal files were found -->
>> <strict>true</strict>
>> </configuration>
>> </execution>
>> </executions>
>> </plugin>
>> -
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-remote-resources-plugin</artifactId>
>> - </plugin>
>> -
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-stage-plugin</artifactId>
>> - </plugin>
>> -
>> <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-release-plugin</artifactId>
>> + <groupId>org.apache.felix</groupId>
>> + <artifactId>maven-bundle-plugin</artifactId>
>> + <version>${felix-version}</version>
>> + <extensions>true</extensions>
>> + <configuration>
>> + <instructions>
>> + <Bundle-Name>${artifactId}</Bundle-Name>
>> + <Bundle-SymbolicName>${activemq.osgi.symbolic.name
>> }</Bundle-SymbolicName>
>> + <Export-Package>${activemq.osgi.export}</Export-Package>
>> + <Import-Package>${activemq.osgi.import}</Import-Package>
>> +
>> <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
>> + <Implementation-Title>Apache ActiveMQ</Implementation-
>> Title>
>> +
>> <Implementation-Version>${project.version}</Implementation-Version>
>> + </instructions>
>> + </configuration>
>> </plugin>
>> </plugins>
>> </build>
>> @@ -1141,7 +1042,8 @@
>> <link>http://junit.sourceforge.net/javadoc/</link>
>> <link>http://logging.apache.org/log4j/docs/api/</link>
>> </links>
>> -
>> <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
>> + <!-- the stylesheet is missing from activemq 6. This
>> kind of
>> cross-project file reference is a bad idea -->
>> +
>> <!--<stylesheetfile>${basedir}/../etc/css/stylesheet.css</
>> stylesheetfile>-->
>> <linksource>true</linksource>
>> <maxmemory>900m</maxmemory>
>> <source>1.5</source>
>> @@ -1165,97 +1067,44 @@
>> <profiles>
>>
>> <profile>
>> - <id>release</id>
>> -
>> + <id>apache-release</id>
>> + <activation>
>> + <property>
>> + <name>apache-release</name>
>> + </property>
>> + </activation>
>> <build>
>> <plugins>
>> -
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-surefire-plugin</artifactId>
>> - <configuration>
>> - <test>false</test>
>> - </configuration>
>> - </plugin>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-release-plugin</artifactId>
>> - <configuration>
>> - <useReleaseProfile>false</useReleaseProfile>
>> - <goals>deploy</goals>
>> - <arguments>-Prelease</arguments>
>> - <autoVersionSubmodules>true</autoVersionSubmodules>
>> - </configuration>
>> - </plugin>
>> -
>> - <!-- We want a source jar -->
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-source-plugin</artifactId>
>> - <executions>
>> - <execution>
>> - <goals>
>> - <goal>jar</goal>
>> - </goals>
>> - </execution>
>> - </executions>
>> - </plugin>
>> -
>> - <!-- We want to sign the artifact, the POM, and all
>> attached
>> artifacts -->
>> <plugin>
>> <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-gpg-plugin</artifactId>
>> - <inherited>true</inherited>
>> - <configuration>
>> - <passphrase>${gpg.passphrase}</passphrase>
>> - </configuration>
>> + <artifactId>maven-assembly-plugin</artifactId>
>> <executions>
>> <execution>
>> <goals>
>> - <goal>sign</goal>
>> + <goal>single</goal>
>> </goals>
>> + <phase>package</phase>
>> + <configuration>
>> + <runOnlyAtExecutionRoot>true</
>> runOnlyAtExecutionRoot>
>> + <descriptorRefs>
>> + <descriptorRef>
>> + source-release
>> + </descriptorRef>
>> + </descriptorRefs>
>> + </configuration>
>> </execution>
>> </executions>
>> + <dependencies>
>> + <dependency>
>> + <!-- apache version not yet released -->
>> + <!--<groupId>org.apache</groupId>-->
>> + <groupId>org.apache.geronimo.genesis</groupId>
>> +
>> <artifactId>apache-source-release-assembly-descriptor</artifactId>
>> + <!-- apache version not yet known -->
>> + <version>2.0</version>
>> + </dependency>
>> + </dependencies>
>> </plugin>
>> -
>> - <!-- We want to deploy the artifact to a staging
>> location for
>> perusal -->
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-deploy-plugin</artifactId>
>> - <inherited>true</inherited>
>> - <configuration>
>> -
>> <altDeploymentRepository>${staging.altRepository}/${siteId}</
>> altDeploymentRepository>
>> - <updateReleaseInfo>true</updateReleaseInfo>
>> - </configuration>
>> - </plugin>
>> -
>> - <!-- We want the JavaDoc JAR published with the release
>> -->
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-javadoc-plugin</artifactId>
>> - <inherited>true</inherited>
>> - <configuration>
>> - <source>1.5</source>
>> - </configuration>
>> - <executions>
>> - <execution>
>> - <id>attach-javadocs</id>
>> - <goals>
>> - <goal>jar</goal>
>> - </goals>
>> - </execution>
>> - </executions>
>> - </plugin>
>> - </plugins>
>> - </build>
>> - </profile>
>> -
>> - <profile>
>> - <id>full</id>
>> -
>> - <build>
>> - <plugins>
>> -
>> <plugin>
>> <groupId>org.apache.maven.plugins</groupId>
>> <artifactId>maven-surefire-plugin</artifactId>
>> @@ -1263,37 +1112,6 @@
>> <test>false</test>
>> </configuration>
>> </plugin>
>> -
>> - <!-- We want a source jar -->
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-source-plugin</artifactId>
>> - <executions>
>> - <execution>
>> - <goals>
>> - <goal>jar</goal>
>> - </goals>
>> - </execution>
>> - </executions>
>> - </plugin>
>> -
>> - <!-- We want the JavaDoc JAR published with the release
>> -->
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-javadoc-plugin</artifactId>
>> - <inherited>true</inherited>
>> - <configuration>
>> - <source>1.5</source>
>> - </configuration>
>> - <executions>
>> - <execution>
>> - <id>attach-javadocs</id>
>> - <goals>
>> - <goal>jar</goal>
>> - </goals>
>> - </execution>
>> - </executions>
>> - </plugin>
>> </plugins>
>> </build>
>> </profile>
>>
>>
>>
>
>
> --
> Regards,
> Hiram
>
> Blog: http://hiramchirino.com
>
> Open Source SOA
> http://fusesource.com/