You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/04/20 14:38:46 UTC
svn commit: r935893 - in /geronimo/bundles: ./ branches/ tags/ trunk/
trunk/asm-3.1/ trunk/asm-commons-3.1/ trunk/aspectjrt/ trunk/aspectjweaver/
trunk/axis/ trunk/backport-util-concurrent/ trunk/bundles-parent/
trunk/bundles-parent/src/ trunk/bundles-...
Author: rickmcguire
Date: Tue Apr 20 12:38:45 2010
New Revision: 935893
URL: http://svn.apache.org/viewvc?rev=935893&view=rev
Log:
GERONIMO-5260 - Geronimo bundle members need to be released separately
Added:
geronimo/bundles/
geronimo/bundles/branches/
geronimo/bundles/tags/
geronimo/bundles/trunk/ (props changed)
- copied from r934981, geronimo/server/trunk/framework/bundles/
geronimo/bundles/trunk/LICENSE
geronimo/bundles/trunk/NOTICE
geronimo/bundles/trunk/bundles-parent/
geronimo/bundles/trunk/bundles-parent/LICENSE
geronimo/bundles/trunk/bundles-parent/NOTICE
geronimo/bundles/trunk/bundles-parent/pom.xml (with props)
geronimo/bundles/trunk/bundles-parent/src/
geronimo/bundles/trunk/bundles-parent/src/site/
geronimo/bundles/trunk/bundles-parent/src/site/apt/
geronimo/bundles/trunk/bundles-parent/src/site/site.xml (with props)
Modified:
geronimo/bundles/trunk/asm-3.1/pom.xml
geronimo/bundles/trunk/asm-commons-3.1/pom.xml
geronimo/bundles/trunk/aspectjrt/pom.xml
geronimo/bundles/trunk/aspectjweaver/pom.xml
geronimo/bundles/trunk/axis/pom.xml
geronimo/bundles/trunk/backport-util-concurrent/pom.xml
geronimo/bundles/trunk/castor/pom.xml
geronimo/bundles/trunk/commons-digester/pom.xml
geronimo/bundles/trunk/commons-discovery/pom.xml
geronimo/bundles/trunk/derby-all/pom.xml
geronimo/bundles/trunk/dwr/pom.xml
geronimo/bundles/trunk/httpcore/pom.xml
geronimo/bundles/trunk/jaxb-impl/pom.xml
geronimo/bundles/trunk/jstl/pom.xml
geronimo/bundles/trunk/karaf-client/pom.xml
geronimo/bundles/trunk/ldapsdk/pom.xml
geronimo/bundles/trunk/log4j/pom.xml
geronimo/bundles/trunk/pom.xml
geronimo/bundles/trunk/sxc-jaxb/pom.xml
geronimo/bundles/trunk/sxc-runtime/pom.xml
geronimo/bundles/trunk/wadi-aop/pom.xml
geronimo/bundles/trunk/wadi-core/pom.xml
geronimo/bundles/trunk/wadi-tribes/pom.xml
geronimo/bundles/trunk/woden-impl-dom/pom.xml
geronimo/bundles/trunk/woodstox/pom.xml
Propchange: geronimo/bundles/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 20 12:38:45 2010
@@ -0,0 +1,2 @@
+/geronimo/server/branches/2.2/framework/bundles:826768,832538,885058
+/geronimo/server/trunk/framework/bundles:749113,749116-807432,809079-825588
Added: geronimo/bundles/trunk/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/LICENSE?rev=935893&view=auto
==============================================================================
--- geronimo/bundles/trunk/LICENSE (added)
+++ geronimo/bundles/trunk/LICENSE Tue Apr 20 12:38:45 2010
@@ -0,0 +1,257 @@
+
+ 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.
+
+
+#########################################################################
+## ADDITIONAL LICENSES ##
+#########################################################################
+
+The XMLSchema.dtd included in this project was developed by the
+W3C Consortium (http://www.w3c.org/).
+Use of the source code, thus licensed, and the resultant binary are
+subject to the terms and conditions of the following license.
+
+W3C¨ SOFTWARE NOTICE AND LICENSE
+Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
+Technology, Institut National de Recherche en Informatique et en Automatique,
+Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
+
+This W3C work (including software, documents, or other related items) is
+being provided by the copyright holders under the following license. By
+obtaining, using and/or copying this work, you (the licensee) agree that you
+have read, understood, and will comply with the following terms and
+conditions:
+
+Permission to use, copy, modify, and distribute this software and its
+documentation, with or without modification, for any purpose and without
+fee or royalty is hereby granted, provided that you include the following on
+ALL copies of the software and documentation or portions thereof, including
+modifications, that you make:
+
+ 1. The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+ 2. Any pre-existing intellectual property disclaimers, notices, or terms
+ and conditions. If none exist, a short notice of the following form
+ (hypertext is preferred, text is permitted) should be used within
+ the body of any redistributed or derivative code: "Copyright ©
+ [$date-of-software] World Wide Web Consortium, (Massachusetts Institute
+ of Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University). All Rights Reserved.
+ http://www.w3.org/Consortium/Legal/"
+ 3. Notice of any changes or modifications to the W3C files, including the
+ date changes were made. (We recommend you provide URIs to the location
+ from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
+COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at all
+times remain with copyright holders.
Added: geronimo/bundles/trunk/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/NOTICE?rev=935893&view=auto
==============================================================================
--- geronimo/bundles/trunk/NOTICE (added)
+++ geronimo/bundles/trunk/NOTICE Tue Apr 20 12:38:45 2010
@@ -0,0 +1,6 @@
+Apache Geronimo
+Copyright 2003-2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Modified: geronimo/bundles/trunk/asm-3.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/asm-3.1/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/asm-3.1/pom.xml (original)
+++ geronimo/bundles/trunk/asm-3.1/pom.xml Tue Apr 20 12:38:45 2010
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>bundles</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -39,6 +39,7 @@
<pkgGroupId>asm</pkgGroupId>
<pkgArtifactId>asm</pkgArtifactId>
<pkgVersion>3.1</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
Modified: geronimo/bundles/trunk/asm-commons-3.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/asm-commons-3.1/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/asm-commons-3.1/pom.xml (original)
+++ geronimo/bundles/trunk/asm-commons-3.1/pom.xml Tue Apr 20 12:38:45 2010
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>bundles</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -39,6 +39,7 @@
<pkgGroupId>asm</pkgGroupId>
<pkgArtifactId>asm-commons</pkgArtifactId>
<pkgVersion>3.1</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
Modified: geronimo/bundles/trunk/aspectjrt/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/aspectjrt/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/aspectjrt/pom.xml (original)
+++ geronimo/bundles/trunk/aspectjrt/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>bundles</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -40,6 +40,7 @@
<pkgGroupId>org.aspectj</pkgGroupId>
<pkgArtifactId>aspectjrt</pkgArtifactId>
<pkgVersion>1.6.2</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
Modified: geronimo/bundles/trunk/aspectjweaver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/aspectjweaver/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/aspectjweaver/pom.xml (original)
+++ geronimo/bundles/trunk/aspectjweaver/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>bundles</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -40,6 +40,7 @@
<pkgGroupId>org.aspectj</pkgGroupId>
<pkgArtifactId>aspectjweaver</pkgArtifactId>
<pkgVersion>1.6.2</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
Modified: geronimo/bundles/trunk/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis/pom.xml (original)
+++ geronimo/bundles/trunk/axis/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>bundles</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -40,6 +40,7 @@
<pkgGroupId>org.apache.axis</pkgGroupId>
<pkgArtifactId>axis</pkgArtifactId>
<pkgVersion>1.4</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
Modified: geronimo/bundles/trunk/backport-util-concurrent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/backport-util-concurrent/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/backport-util-concurrent/pom.xml (original)
+++ geronimo/bundles/trunk/backport-util-concurrent/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>bundles</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -40,6 +40,7 @@
<pkgGroupId>backport-util-concurrent</pkgGroupId>
<pkgArtifactId>backport-util-concurrent</pkgArtifactId>
<pkgVersion>2.2</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
Added: geronimo/bundles/trunk/bundles-parent/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/bundles-parent/LICENSE?rev=935893&view=auto
==============================================================================
--- geronimo/bundles/trunk/bundles-parent/LICENSE (added)
+++ geronimo/bundles/trunk/bundles-parent/LICENSE Tue Apr 20 12:38:45 2010
@@ -0,0 +1,257 @@
+
+ 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.
+
+
+#########################################################################
+## ADDITIONAL LICENSES ##
+#########################################################################
+
+The XMLSchema.dtd included in this project was developed by the
+W3C Consortium (http://www.w3c.org/).
+Use of the source code, thus licensed, and the resultant binary are
+subject to the terms and conditions of the following license.
+
+W3C¨ SOFTWARE NOTICE AND LICENSE
+Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
+Technology, Institut National de Recherche en Informatique et en Automatique,
+Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
+
+This W3C work (including software, documents, or other related items) is
+being provided by the copyright holders under the following license. By
+obtaining, using and/or copying this work, you (the licensee) agree that you
+have read, understood, and will comply with the following terms and
+conditions:
+
+Permission to use, copy, modify, and distribute this software and its
+documentation, with or without modification, for any purpose and without
+fee or royalty is hereby granted, provided that you include the following on
+ALL copies of the software and documentation or portions thereof, including
+modifications, that you make:
+
+ 1. The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+ 2. Any pre-existing intellectual property disclaimers, notices, or terms
+ and conditions. If none exist, a short notice of the following form
+ (hypertext is preferred, text is permitted) should be used within
+ the body of any redistributed or derivative code: "Copyright ©
+ [$date-of-software] World Wide Web Consortium, (Massachusetts Institute
+ of Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University). All Rights Reserved.
+ http://www.w3.org/Consortium/Legal/"
+ 3. Notice of any changes or modifications to the W3C files, including the
+ date changes were made. (We recommend you provide URIs to the location
+ from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
+COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at all
+times remain with copyright holders.
Added: geronimo/bundles/trunk/bundles-parent/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/bundles-parent/NOTICE?rev=935893&view=auto
==============================================================================
--- geronimo/bundles/trunk/bundles-parent/NOTICE (added)
+++ geronimo/bundles/trunk/bundles-parent/NOTICE Tue Apr 20 12:38:45 2010
@@ -0,0 +1,6 @@
+Apache Geronimo
+Copyright 2003-2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: geronimo/bundles/trunk/bundles-parent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/bundles-parent/pom.xml?rev=935893&view=auto
==============================================================================
--- geronimo/bundles/trunk/bundles-parent/pom.xml (added)
+++ geronimo/bundles/trunk/bundles-parent/pom.xml Tue Apr 20 12:38:45 2010
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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.geronimo.genesis.config</groupId>
+ <artifactId>project-config</artifactId>
+ <version>1.5</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Geronimo Repackaged Bundles</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <description>
+ Provides OSGi bundle equivalents to open source components
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/specs-parent</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/specs-parent</developerConnection>
+ <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/bundles-parent</url>
+ </scm>
+
+ <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+ <distributionManagement>
+ <site>
+ <id>apache-website</id>
+ <url>${site.deploy.url}/maven/${siteId}/${version}</url>
+ </site>
+ </distributionManagement>
+
+ <properties>
+ <siteId>specs</siteId>
+ <projectName>Apache Geronimo Bundles</projectName>
+ <!--
+ |
+ | Geronimo OSGi properties
+ |
+ | Note: when modules can override these properties.
+ |
+ -->
+ <geronimo.osgi.import.pkg>*</geronimo.osgi.import.pkg>
+ <geronimo.osgi.export.pkg>*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.private.pkg />
+ <geronimo.osgi.export>!META-INF*,${geronimo.osgi.export.pkg}*;version=${geronimo.osgi.export.version}</geronimo.osgi.export>
+ <geronimo.osgi.export.version>${project.version}</geronimo.osgi.export.version>
+ <geronimo.osgi.import>!META-INF*,${geronimo.osgi.import.pkg}</geronimo.osgi.import>
+ <geronimo.osgi.symbolic.name>${groupId}.${artifactId}</geronimo.osgi.symbolic.name>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <jdkName>1.5</jdkName>
+ <linkModules>true</linkModules>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${geronimo.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Export-Package>${geronimo.osgi.export}</Export-Package>
+ <Import-Package>${geronimo.osgi.import}</Import-Package>
+ <Private-Package>${geronimo.osgi.private.pkg}</Private-Package>
+ <Implementation-Title>Apache Geronimo</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
Propchange: geronimo/bundles/trunk/bundles-parent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/bundles/trunk/bundles-parent/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/bundles/trunk/bundles-parent/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/bundles/trunk/bundles-parent/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/bundles-parent/src/site/site.xml?rev=935893&view=auto
==============================================================================
--- geronimo/bundles/trunk/bundles-parent/src/site/site.xml (added)
+++ geronimo/bundles/trunk/bundles-parent/src/site/site.xml Tue Apr 20 12:38:45 2010
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+
+<!-- $Id: site.xml 708570 2008-10-28 13:39:15Z jbohn $ -->
+
+<project name="${project.name}">
+
+ <skin>
+ <groupId>org.apache.geronimo.genesis.config</groupId>
+ <artifactId>geronimo-skin</artifactId>
+ <version>1.5</version>
+ </skin>
+
+ <publishDate format="dd MMM yyyy"/>
+
+ <bannerLeft>
+ <src>images/topleft_logo_437x64.gif</src>
+ <href>http://geronimo.apache.org</href>
+ </bannerLeft>
+
+ <body>
+
+ <menu ref="parent" />
+ <menu ref="modules" />
+ <menu ref="reports" />
+
+ </body>
+</project>
Propchange: geronimo/bundles/trunk/bundles-parent/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/bundles/trunk/bundles-parent/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/bundles/trunk/bundles-parent/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/bundles/trunk/castor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/castor/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/castor/pom.xml (original)
+++ geronimo/bundles/trunk/castor/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>bundles</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -40,6 +40,7 @@
<pkgGroupId>org.codehaus.castor</pkgGroupId>
<pkgArtifactId>castor</pkgArtifactId>
<pkgVersion>1.0.5</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
@@ -47,6 +48,52 @@
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>adaptx</groupId>
+ <artifactId>adaptx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.cenqua.clover</groupId>
+ <artifactId>clover</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ldapsdk</groupId>
+ <artifactId>ldapsdk</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: geronimo/bundles/trunk/commons-digester/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/commons-digester/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/commons-digester/pom.xml (original)
+++ geronimo/bundles/trunk/commons-digester/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>bundles</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -40,6 +40,7 @@
<pkgGroupId>commons-digester</pkgGroupId>
<pkgArtifactId>commons-digester</pkgArtifactId>
<pkgVersion>1.8</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
@@ -52,6 +53,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
+ <version>1.7.0_3</version>
</dependency>
</dependencies>
Modified: geronimo/bundles/trunk/commons-discovery/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/commons-discovery/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/commons-discovery/pom.xml (original)
+++ geronimo/bundles/trunk/commons-discovery/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>bundles</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -40,6 +40,7 @@
<pkgGroupId>commons-discovery</pkgGroupId>
<pkgArtifactId>commons-discovery</pkgArtifactId>
<pkgVersion>0.4</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
Modified: geronimo/bundles/trunk/derby-all/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/derby-all/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/derby-all/pom.xml (original)
+++ geronimo/bundles/trunk/derby-all/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>bundles</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -39,6 +39,7 @@
<properties>
<pkgGroupId>org.apache.derby</pkgGroupId>
<pkgVersion>10.5.3.0_1</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
@@ -69,6 +70,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
</dependency>
</dependencies>
Modified: geronimo/bundles/trunk/dwr/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/dwr/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/dwr/pom.xml (original)
+++ geronimo/bundles/trunk/dwr/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,10 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -52,6 +51,7 @@
<pkgGroupId>org.directwebremoting</pkgGroupId>
<pkgArtifactId>dwr</pkgArtifactId>
<pkgVersion>3.0.M1</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
Modified: geronimo/bundles/trunk/httpcore/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/httpcore/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/httpcore/pom.xml (original)
+++ geronimo/bundles/trunk/httpcore/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,10 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -41,6 +40,7 @@
<pkgGroupId>org.apache.httpcomponents</pkgGroupId>
<pkgArtifactId>httpcore</pkgArtifactId>
<pkgVersion>4.0.1</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
Modified: geronimo/bundles/trunk/jaxb-impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/jaxb-impl/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/jaxb-impl/pom.xml (original)
+++ geronimo/bundles/trunk/jaxb-impl/pom.xml Tue Apr 20 12:38:45 2010
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -39,6 +39,7 @@
<pkgGroupId>com.sun.xml.bind</pkgGroupId>
<pkgArtifactId>jaxb-impl</pkgArtifactId>
<pkgVersion>2.2</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
@@ -51,14 +52,17 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.2_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.2_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.1</version>
</dependency>
</dependencies>
Modified: geronimo/bundles/trunk/jstl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/jstl/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/jstl/pom.xml (original)
+++ geronimo/bundles/trunk/jstl/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,10 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -41,6 +40,7 @@
<pkgGroupId>javax.servlet</pkgGroupId>
<pkgArtifactId>jstl</pkgArtifactId>
<pkgVersion>1.2</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
Modified: geronimo/bundles/trunk/karaf-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/karaf-client/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/karaf-client/pom.xml (original)
+++ geronimo/bundles/trunk/karaf-client/pom.xml Tue Apr 20 12:38:45 2010
@@ -24,10 +24,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -43,6 +42,7 @@
<pkgGroupId>org.apache.felix.karaf</pkgGroupId>
<pkgArtifactId>org.apache.felix.karaf.client</pkgArtifactId>
<pkgVersion>1.5.0-SNAPSHOT</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
Modified: geronimo/bundles/trunk/ldapsdk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/ldapsdk/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/ldapsdk/pom.xml (original)
+++ geronimo/bundles/trunk/ldapsdk/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,10 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -41,6 +40,7 @@
<pkgGroupId>ldapsdk</pkgGroupId>
<pkgArtifactId>ldapsdk</pkgArtifactId>
<pkgVersion>4.1</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
Modified: geronimo/bundles/trunk/log4j/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/log4j/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/log4j/pom.xml (original)
+++ geronimo/bundles/trunk/log4j/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,10 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -41,6 +40,7 @@
<pkgGroupId>log4j</pkgGroupId>
<pkgArtifactId>log4j</pkgArtifactId>
<pkgVersion>1.2.15</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
Modified: geronimo/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/pom.xml (original)
+++ geronimo/bundles/trunk/pom.xml Tue Apr 20 12:38:45 2010
@@ -24,15 +24,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.genesis.config</groupId>
+ <artifactId>project-config</artifactId>
+ <version>1.5</version>
</parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>bundles</artifactId>
- <name>Geronimo bundles repackaging</name>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-main</artifactId>
<packaging>pom</packaging>
+ <name>Geronimo Repackaged Bundles</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <description>
+ Dummy project for building all snapshot bundles at one time. This
+ is never released.
+ </description>
<modules>
<module>aspectjrt</module>
@@ -49,7 +55,6 @@
<module>backport-util-concurrent</module>
<module>httpcore</module>
<module>karaf-client</module>
- <!-- todo remove -->
<module>sxc-jaxb</module>
<module>sxc-runtime</module>
<module>wadi-aop</module>
Modified: geronimo/bundles/trunk/sxc-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-jaxb/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/sxc-jaxb/pom.xml (original)
+++ geronimo/bundles/trunk/sxc-jaxb/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,10 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -41,6 +40,7 @@
<pkgGroupId>com.envoisolutions.sxc</pkgGroupId>
<pkgArtifactId>sxc-jaxb</pkgArtifactId>
<pkgVersion>0.7.2</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
@@ -53,22 +53,25 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <!--<optional>true</optional>-->
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.2_spec</artifactId>
+ <version>1.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.2_spec</artifactId>
+ <version>1.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jaxb-impl</artifactId>
<optional>true</optional>
+ <version>2.2_1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: geronimo/bundles/trunk/sxc-runtime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-runtime/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/sxc-runtime/pom.xml (original)
+++ geronimo/bundles/trunk/sxc-runtime/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,10 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -41,6 +40,7 @@
<pkgGroupId>com.envoisolutions.sxc</pkgGroupId>
<pkgArtifactId>sxc-runtime</pkgArtifactId>
<pkgVersion>0.7.2</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
Modified: geronimo/bundles/trunk/wadi-aop/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-aop/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/wadi-aop/pom.xml (original)
+++ geronimo/bundles/trunk/wadi-aop/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,10 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -41,6 +40,7 @@
<pkgGroupId>org.codehaus.wadi</pkgGroupId>
<pkgArtifactId>wadi-aop</pkgArtifactId>
<pkgVersion>2.1.2</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
Modified: geronimo/bundles/trunk/wadi-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-core/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/wadi-core/pom.xml (original)
+++ geronimo/bundles/trunk/wadi-core/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,10 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -41,6 +40,7 @@
<pkgGroupId>org.codehaus.wadi</pkgGroupId>
<pkgArtifactId>wadi-core</pkgArtifactId>
<pkgVersion>2.1.2</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
Modified: geronimo/bundles/trunk/wadi-tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-tribes/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/wadi-tribes/pom.xml (original)
+++ geronimo/bundles/trunk/wadi-tribes/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,10 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -41,6 +40,7 @@
<pkgGroupId>org.codehaus.wadi</pkgGroupId>
<pkgArtifactId>wadi-tribes</pkgArtifactId>
<pkgVersion>2.1.2</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
<dependency>
Modified: geronimo/bundles/trunk/woden-impl-dom/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/woden-impl-dom/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/woden-impl-dom/pom.xml (original)
+++ geronimo/bundles/trunk/woden-impl-dom/pom.xml Tue Apr 20 12:38:45 2010
@@ -22,10 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -41,6 +40,7 @@
<pkgGroupId>org.apache.woden</pkgGroupId>
<pkgArtifactId>woden-impl-dom</pkgArtifactId>
<pkgVersion>1.0M8</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
Modified: geronimo/bundles/trunk/woodstox/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/woodstox/pom.xml?rev=935893&r1=934981&r2=935893&view=diff
==============================================================================
--- geronimo/bundles/trunk/woodstox/pom.xml (original)
+++ geronimo/bundles/trunk/woodstox/pom.xml Tue Apr 20 12:38:45 2010
@@ -21,10 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>framework</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>bundles-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -40,6 +39,7 @@
<pkgGroupId>org.codehaus.woodstox</pkgGroupId>
<pkgArtifactId>woodstox</pkgArtifactId>
<pkgVersion>3.2.9</pkgVersion>
+ <bundleVersion>_1-SNAPSHOT</bundleVersion>
</properties>
<dependencies>
@@ -52,6 +52,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.2_spec</artifactId>
+ <version>1.0</version>
</dependency>
</dependencies>