[maven-scm] copy for tag geronimo-3.0-M1
git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/tags/geronimo-3.0-M1@953019 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/configs/karaf-framework/src/main/distribution/text/LICENSE b/framework/configs/karaf-framework/src/main/distribution/text/LICENSE
index 72fa554..5d983f2 100644
--- a/framework/configs/karaf-framework/src/main/distribution/text/LICENSE
+++ b/framework/configs/karaf-framework/src/main/distribution/text/LICENSE
@@ -201,6 +201,889 @@
See the License for the specific language governing permissions and
limitations under the License.
+#########################################################################
+## ADDITIONAL SOURCE LICENSES ##
+#########################################################################
+
+The ASN1 codec implementation in the geronimo-crypto module was
+developed by the Bouncy Castle project. (http://www.bouncycastle.org/).
+Use of the source code, thus licensed, and the resultant binary are
+subject to the terms and conditions of the following license.
+
+=========================================================================
+== Bouncy Castle License (ASN1 codec in geronimo-util) ==
+=========================================================================
+
+The Bouncy Castle License
+
+Copyright (c) 2000-2005 The Legion Of The Bouncy Castle
+(http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=========================================================================
+== Sun CDDL/GPL 2 + Classpath Restriction Dual License ==
+=========================================================================
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+1.1. Contributor means each individual or entity that creates or
+ contributes to the creation of Modifications.
+
+1.2. Contributor Version means the combination of the Original
+ Software, prior Modifications used by a Contributor (if any), and
+ the Modifications made by that particular Contributor.
+
+1.3. Covered Software means (a) the Original Software, or (b)
+ Modifications, or (c) the combination of files containing
+ Original Software with files containing Modifications, in each
+ case including portions thereof.
+
+1.4. Executable means the Covered Software in any form other than
+ Source Code.
+
+1.5. Initial Developer means the individual or entity that first makes
+ Original Software available under this License.
+
+1.6. Larger Work means a work which combines Covered Software or
+ portions thereof with code not governed by the terms of this
+ License.
+
+1.7. License means this document.
+
+1.8. Licensable means having the right to grant, to the maximum extent
+ possible, whether at the time of the initial grant or
+ subsequently acquired, any and all of the rights conveyed herein.
+
+1.9. Modifications means the Source Code and Executable form of any of
+ the following:
+
+A. Any file that results from an addition to, deletion from or
+modification of the contents of a file containing Original Software or
+previous Modifications;
+
+B. Any new file that contains any part of the Original Software or
+previous Modification; or
+
+C. Any new file that is contributed or otherwise made available under
+the terms of this License.
+
+1.10. Original Software means the Source Code and Executable form of
+ computer software code that is originally released under this
+ License.
+
+1.11. Patent Claims means any patent claim(s), now owned or hereafter
+ acquired, including without limitation, method, process, and
+ apparatus claims, in any patent Licensable by grantor.
+
+1.12. Source Code means (a) the common form of computer software code
+ in which modifications are made and (b) associated documentation
+ included in or with such code.
+
+1.13. You (or Your) means an individual or a legal entity exercising
+ rights under, and complying with all of the terms of, this
+ License. For legal entities, You includes any entity which
+ controls, is controlled by, or is under common control with
+ You. For purposes of this definition, control means (a)áthe
+ power, direct or indirect, to cause the direction or management
+ of such entity, whether by contract or otherwise, or
+ (b)áownership of more than fifty percent (50%) of the
+ outstanding shares or beneficial ownership of such entity.
+
+2. License Grants.
+
+2.1. The Initial Developer Grant. Conditioned upon Your compliance
+with Section 3.1 below and subject to third party intellectual
+property claims, the Initial Developer hereby grants You a world-wide,
+royalty-free, non-exclusive license: (a) under intellectual property
+rights (other than patent or trademark) Licensable by Initial
+Developer, to use, reproduce, modify, display, perform, sublicense and
+distribute the Original Software (or portions thereof), with or
+without Modifications, and/or as part of a Larger Work; and (b) under
+Patent Claims infringed by the making, using or selling of Original
+Software, to make, have made, use, practice, sell, and offer for sale,
+and/or otherwise dispose of the Original Software (or portions
+thereof). (c) The licenses granted in Sectionsá2.1(a) and (b) are
+effective on the date Initial Developer first distributes or otherwise
+makes the Original Software available to a third party under the terms
+of this License. (d) Notwithstanding Sectioná2.1(b) above, no patent
+license is granted: (1)áfor code that You delete from the Original
+Software, or (2)áfor infringements caused by: (i)áthe modification of
+the Original Software, or (ii)áthe combination of the Original
+Software with other software or devices.
+
+2.2. Contributor Grant. Conditioned upon Your compliance with Section
+3.1 below and subject to third party intellectual property claims,
+each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license: (a) under intellectual property rights (other
+than patent or trademark) Licensable by Contributor to use, reproduce,
+modify, display, perform, sublicense and distribute the Modifications
+created by such Contributor (or portions thereof), either on an
+unmodified basis, with other Modifications, as Covered Software and/or
+as part of a Larger Work; and (b) under Patent Claims infringed by the
+making, using, or selling of Modifications made by that Contributor
+either alone and/or in combination with its Contributor Version (or
+portions of such combination), to make, use, sell, offer for sale,
+have made, and/or otherwise dispose of: (1)áModifications made by that
+Contributor (or portions thereof); and (2)áthe combination of
+Modifications made by that Contributor with its Contributor Version
+(or portions of such combination). (c) The licenses granted in
+Sectionsá2.2(a) and 2.2(b) are effective on the date Contributor first
+distributes or otherwise makes the Modifications available to a third
+party. (d) Notwithstanding Sectioná2.2(b) above, no patent license is
+granted: (1)áfor any code that Contributor has deleted from the
+Contributor Version; (2)áfor infringements caused by: (i)áthird party
+modifications of Contributor Version, or (ii)áthe combination of
+Modifications made by that Contributor with other software (except as
+part of the Contributor Version) or other devices; or (3)áunder Patent
+Claims infringed by Covered Software in the absence of Modifications
+made by that Contributor.
+
+3. Distribution Obligations.
+
+3.1. Availability of Source Code.
+
+Any Covered Software that You distribute or otherwise make available
+in Executable form must also be made available in Source Code form and
+that Source Code form must be distributed only under the terms of this
+License. You must include a copy of this License with every copy of
+the Source Code form of the Covered Software You distribute or
+otherwise make available. You must inform recipients of any such
+Covered Software in Executable form as to how they can obtain such
+Covered Software in Source Code form in a reasonable manner on or
+through a medium customarily used for software exchange.
+
+3.2. Modifications.
+
+The Modifications that You create or to which You contribute are
+governed by the terms of this License. You represent that You believe
+Your Modifications are Your original creation(s) and/or You have
+sufficient rights to grant the rights conveyed by this License.
+
+3.3. Required Notices. You must include a notice in each of Your
+Modifications that identifies You as the Contributor of the
+Modification. You may not remove or alter any copyright, patent or
+trademark notices contained within the Covered Software, or any
+notices of licensing or any descriptive text giving attribution to any
+Contributor or the Initial Developer.
+
+3.4. Application of Additional Terms. You may not offer or impose any
+terms on any Covered Software in Source Code form that alters or
+restricts the applicable version of this License or the recipients
+rights hereunder. You may choose to offer, and to charge a fee for,
+warranty, support, indemnity or liability obligations to one or more
+recipients of Covered Software. However, you may do so only on Your
+own behalf, and not on behalf of the Initial Developer or any
+Contributor. You must make it absolutely clear that any such warranty,
+support, indemnity or liability obligation is offered by You alone,
+and You hereby agree to indemnify the Initial Developer and every
+Contributor for any liability incurred by the Initial Developer or
+such Contributor as a result of warranty, support, indemnity or
+liability terms You offer.
+
+3.5. Distribution of Executable Versions. You may distribute the
+Executable form of the Covered Software under the terms of this
+License or under the terms of a license of Your choice, which may
+contain terms different from this License, provided that You are in
+compliance with the terms of this License and that the license for the
+Executable form does not attempt to limit or alter the recipients
+rights in the Source Code form from the rights set forth in this
+License. If You distribute the Covered Software in Executable form
+under a different license, You must make it absolutely clear that any
+terms which differ from this License are offered by You alone, not by
+the Initial Developer or Contributor. You hereby agree to indemnify
+the Initial Developer and every Contributor for any liability incurred
+by the Initial Developer or such Contributor as a result of any such
+terms You offer.
+
+3.6. Larger Works. You may create a Larger Work by combining Covered
+Software with other code not governed by the terms of this License and
+distribute the Larger Work as a single product. In such a case, You
+must make sure the requirements of this License are fulfilled for the
+Covered Software.
+
+4. Versions of the License.
+
+4.1. New Versions. Sun Microsystems, Inc. is the initial license
+steward and may publish revised and/or new versions of this License
+from time to time. Each version will be given a distinguishing version
+number. Except as provided in Section 4.3, no one other than the
+license steward has the right to modify this License.
+
+4.2. Effect of New Versions.
+
+You may always continue to use, distribute or otherwise make the
+Covered Software available under the terms of the version of the
+License under which You originally received the Covered Software. If
+the Initial Developer includes a notice in the Original Software
+prohibiting it from being distributed or otherwise made available
+under any subsequent version of the License, You must distribute and
+make the Covered Software available under the terms of the version of
+the License under which You originally received the Covered
+Software. Otherwise, You may also choose to use, distribute or
+otherwise make the Covered Software available under the terms of any
+subsequent version of the License published by the license steward.
+4.3. Modified Versions.
+
+When You are an Initial Developer and You want to create a new license
+for Your Original Software, You may create and use a modified version
+of this License if You: (a)árename the license and remove any
+references to the name of the license steward (except to note that the
+license differs from this License); and (b)áotherwise make it clear
+that the license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS,
+WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
+NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
+THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE
+DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER
+CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
+CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART
+OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED
+HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to
+ cure such breach within 30 days of becoming aware of the
+ breach. Provisions which, by their nature, must remain in effect
+ beyond the termination of this License shall survive.
+
+6.2. If You assert a patent infringement claim (excluding declaratory
+ judgment actions) against Initial Developer or a Contributor (the
+ Initial Developer or Contributor against whom You assert such
+ claim is referred to as Participant) alleging that the
+ Participant Software (meaning the Contributor Version where the
+ Participant is a Contributor or the Original Software where the
+ Participant is the Initial Developer) directly or indirectly
+ infringes any patent, then any and all rights granted directly or
+ indirectly to You by such Participant, the Initial Developer (if
+ the Initial Developer is not the Participant) and all
+ Contributors under Sectionsá2.1 and/or 2.2 of this License shall,
+ upon 60 days notice from Participant terminate prospectively and
+ automatically at the expiration of such 60 day notice period,
+ unless if within such 60 day period You withdraw Your claim with
+ respect to the Participant Software against such Participant
+ either unilaterally or pursuant to a written agreement with
+ Participant.
+
+6.3. In the event of termination under Sectionsá6.1 or 6.2 above, all
+ end user licenses that have been validly granted by You or any
+ distributor hereunder prior to termination (excluding licenses
+ granted to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED
+SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY
+PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST
+PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
+MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN
+IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH
+DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR
+DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE
+EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL
+DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a commercial item, as that term is defined in
+48áC.F.R.á2.101 (Oct. 1995), consisting of commercial computer
+software (as that term is defined at 48 C.F.R. á252.227-7014(a)(1))
+and commercial computer software documentation as such terms are used
+in 48áC.F.R.á12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and
+48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all
+U.S. Government End Users acquire Covered Software with only those
+rights set forth herein. This U.S. Government Rights clause is in lieu
+of, and supersedes, any other FAR, DFAR, or other clause or provision
+that addresses Government rights in computer software under this
+License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. This License shall be governed by
+the law of the jurisdiction specified in a notice contained within the
+Original Software (except to the extent applicable law, if any,
+provides otherwise), excluding such jurisdictions conflict-of-law
+provisions. Any litigation relating to this License shall be subject
+to the jurisdiction of the courts located in the jurisdiction and
+venue specified in a notice contained within the Original Software,
+with the losing party responsible for costs, including, without
+limitation, court costs and reasonable attorneys fees and
+expenses. The application of the United Nations Convention on
+Contracts for the International Sale of Goods is expressly
+excluded. Any law or regulation which provides that the language of a
+contract shall be construed against the drafter shall not apply to
+this License. You agree that You alone are responsible for compliance
+with the United States export administration regulations (and the
+export control laws and regulation of any other countries) when You
+use, distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is
+responsible for claims and damages arising, directly or indirectly,
+out of its utilization of rights under this License and You agree to
+work with Initial Developer and Contributors to distribute such
+responsibility on an equitable basis. Nothing herein is intended or
+shall be deemed to constitute any admission of liability.
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
+DISTRIBUTION LICENSE (CDDL) The GlassFish code released under the CDDL
+shall be governed by the laws of the State of California (excluding
+conflict-of-law provisions). Any litigation relating to this License
+shall be subject to the jurisdiction of the Federal Courts of the
+Northern District of California and the state courts of the State of
+California, with venue lying in Santa Clara County, California.
+
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+
+"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+Certain source files distributed by Sun Microsystems, Inc. are subject to the
+following clarification and special exception to the GPL Version 2, but only
+where Sun has expressly included in the particular source file's header the words
+"Sun designates this particular file as subject to the "Classpath" exception
+as provided by Sun in the License file that accompanied this code."
+
+Linking this library statically or dynamically with other modules is making a
+combined work based on this library. Thus, the terms and conditions of the GNU
+General Public License Version 2 cover the whole combination.
+
+As a special exception, the copyright holders of this library give you permission
+to link this library with independent modules to produce an executable, regardless
+of the license terms of these independent modules, and to copy and distribute the
+resulting executable under terms of your choice, provided that you also meet, for
+each linked independent module, the terms and conditions of the license of that
+module.? An independent module is a module which is not derived from or based on
+this library.? If you modify this library, you may extend this exception to your
+version of the library, but you are not obligated to do so.? If you do not wish to
+do so, delete this exception statement from your version.
+
+The following artifacts are covered by the Common Development and
+Distribution License and GPL 2.0 + Classpath Exemption Dual License.
+
+Apache Geronimo elects to include this software in this distribution
+under the CDDL license.
+
+
+This product includes schema files developed for the Glassfish Java EE
+reference implementation. Apache Geronimo elects to include this software
+in this distribution under the CDDL license.
+
+The following schemas are included:
+
+===========================
+ application-client_1_4.xsd
+ application_1_4.xsd
+ connector_1_5.xsd
+ datatypes.dtd
+ ejb-jar_2_1.xsd
+ j2ee_1_4.xsd
+ j2ee_jaxrpc_mapping_1_1.xsd
+ j2ee_web_services_1_1.xsd
+ j2ee_web_services_client_1_1.xsd
+ jsp_2_0.xsd
+ web-app_2_4.xsd
+ web-jsptaglibrary_2_0.xsd
+ application-client_5.xsd
+ application_5.xsd
+ ejb-jar_3_0.xsd
+ handler-chain.xsd
+ javaee_5.xsd
+ javaee_web_services_1_2.xsd
+ javaee_web_services_client_1_2.xsd
+ jsp_2_1.xsd
+ persistence_1_0.xsd
+ web-app_2_5.xsd
+ web-facelettaglibrary_2_0.xsd
+ web-facesconfig_2_0.xsd
+ web-partialresponse_2_0.xsd
+ web-jsptaglibrary_2_1.xsd
+ application_6.xsd
+ application-client_6.xsd
+ connector_1_6.xsd
+ ejb-jar_3_1.xsd
+ javaee_6.xsd
+ javaee_web_services_1_3.xsd
+ javaee_web_services_client_1_3.xsd
+ jsp_2_2.xsd
+ persistence_2_0.xsd
+ web-app_3_0.xsd
+ web-common_3_0.xsd
+ web-fragment_3_0.xsd
+===========================
+
+
+=========================================================================
+== W3C License ==
+=========================================================================
+
+W3C® SOFTWARE NOTICE AND LICENSE
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This work (and included software, documentation such as READMEs, 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 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:
+
+ 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, the W3C Software Short Notice should be
+ included (hypertext is preferred, text is permitted) within the body
+ of any redistributed or derivative code.
+ 3. Notice of any changes or modifications to the 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.
+
+____________________________________
+
+This formulation of W3C's notice and license became active on December 31 2002.
+This version removes the copyright ownership notice such that this license can
+be used with materials other than those owned by the W3C, reflects that ERCIM
+is now a host of the W3C, includes references to this specific dated version of
+the license, and removes the ambiguous grant of "use". Otherwise, this version
+is the same as the previous version and is written so as to preserve the Free
+Software Foundation's assessment of GPL compatibility and OSI's certification
+under the Open Source Definition. Please see our Copyright FAQ for common
+questions about using materials from our site, including specific terms and
+conditions for packages like libwww, Amaya, and Jigsaw. Other questions about
+this notice can be directed to site-policy@w3.org.
+
+Joseph Reagle <site-policy@w3.org>
+
+The following artifacts are also covered by the above W3C license:
+
+soap_encoding_1_1.xsd in ./repository/org/apache/geronimo/modules/geronimo-webservices-builder/3.0-M1/geronimo-webservices-builder-3.0-M1.jar
+soap_encoding_1_1.xsd in ./repository/org/apache/geronimo/ext/openejb/openejb-jee/3.1.3.0/openejb-jee-3.1.3.0.jar
+
+=========================================================================
+== IBM wsdl.xsd license ==
+=========================================================================
+
+Copyright 2001-2003 International Business Machines Corporation, Microsoft
+Corporation. All rights reserved.
+
+The presentation, distribution or other dissemination of the
+information contained herein by Microsoft is not a license,
+either expressly or impliedly, to any intellectual property owned or
+controlled by Microsoft.
+
+This document and the information contained herein is provided on an
+"AS IS" basis and to the maximum extent permitted by applicable law,
+Microsoft provides the document AS IS AND WITH ALL FAULTS, and hereby
+disclaims all other warranties and conditions, either express, implied
+or statutory, including, but not limited to, any (if any) implied
+warranties, duties or conditions of merchantability, of fitness for a
+particular purpose, of accuracy or completeness of responses, of
+results, of workmanlike effort, of lack of viruses, and of lack of
+negligence, all with regard to the document. ALSO, THERE IS NO
+WARRANTY OR CONDITION OF TITLE, QUIET ENJOYMENT, QUIET POSSESSION,
+CORRESPONDENCE TO DESCRIPTION OR NON-INFRINGEMENT WITH REGARD TO THE
+DOCUMENT.
+
+IN NO EVENT WILL MICROSOFT BE LIABLE TO ANY OTHER PARTY FOR THE COST
+OF PROCURING SUBSTITUTE GOODS OR SERVICES, LOST PROFITS, LOSS OF USE,
+LOSS OF DATA, OR ANY INCIDENTAL, CONSEQUENTIAL, DIRECT, INDIRECT, OR
+SPECIAL DAMAGES WHETHER UNDER CONTRACT, TORT, WARRANTY, OR OTHERWISE,
+ARISING IN ANY WAY OUT OF THIS OR ANY OTHER AGREEMENT RELATING TO THIS
+DOCUMENT, WHETHER OR NOT SUCH PARTY HAD ADVANCE NOTICE OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+
+wsdl.xsd.xsd in ./repository/org/apache/geronimo/modules/geronimo-webservices-builder/3.0-M1/geronimo-webservices-builder-3.0-M1.jar
+
#########################################################################
## APACHE GERONIMO DEPENDENCIES ##
diff --git a/testsuite/deployment-testsuite/deployment-tests/pom.xml b/testsuite/deployment-testsuite/deployment-tests/pom.xml
deleted file mode 100644
index 44c135a..0000000
--- a/testsuite/deployment-testsuite/deployment-tests/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?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.testsuite</groupId>
- <artifactId>deployment-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>deployment-tests</artifactId>
- <name>Geronimo TestSuite, Deployment :: Deployment Tests</name>
-
- <description>
- Tests for the test-deployables.
- </description>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ears</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <modules>
- <!-- Deploy only 1 module until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed. -->
- <!--
- <module>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>test-ear-j2ee_1.3</artifactId>
- <version>${project.version}</version>
- <type>ear</type>
- </module>
- -->
-
- <module>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>test-ear-j2ee_1.4</artifactId>
- <version>${project.version}</version>
- <type>ear</type>
- </module>
- </modules>
- </configuration>
- </execution>
-
- <!-- Comment the following block until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed. -->
- <!--
- <execution>
- <id>undeploy-ear-as-module</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <modules>
- <module>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>test-ear-j2ee_1.3</artifactId>
- <version>${project.version}</version>
- <type>ear</type>
- </module>
- </modules>
- </configuration>
- </execution>
- -->
-
- <execution>
- <id>undeploy-ear-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>org.apache.geronimo.testsupport/test-ear-j2ee_1.4/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java b/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
deleted file mode 100644
index 8a59468..0000000
--- a/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.geronimo.testsuite.deployment;
-
-import org.apache.geronimo.testsupport.SeleniumTestSupport;
-import org.testng.annotations.Test;
-
-/**
- * ???
- *
- * @version $Rev$ $Date$
- */
-@Test
-public class Ear13Test
- extends SeleniumTestSupport
-{
- @Test
- public void testIndexContent() throws Exception {
- /*
- * Disabled until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed
- * since the module is not deployed, see pom.xml.
- */
- /*
- selenium.open("/test-1_3/");
- waitForPageLoad();
- assertEquals("Hello J2EE 1.3", selenium.getTitle());
- assertEquals("Hello J2EE 1.3", selenium.getText("xpath=/html/body"));
- */
- }
-}
-
diff --git a/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java b/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
deleted file mode 100644
index ea3eb40..0000000
--- a/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.geronimo.testsuite.deployment;
-
-import org.apache.geronimo.testsupport.SeleniumTestSupport;
-import org.testng.annotations.Test;
-
-/**
- * ???
- *
- * @version $Rev$ $Date$
- */
-@Test
-public class Ear14Test
- extends SeleniumTestSupport
-{
- @Test
- public void testIndexContent() throws Exception {
- selenium.open("/test-1_4/");
- waitForPageLoad();
- assertEquals("Hello J2EE 1.4", selenium.getTitle());
- assertEquals("Hello J2EE 1.4", selenium.getText("xpath=/html/body"));
- }
-}
-
diff --git a/testsuite/deployment-testsuite/deployment-tests/src/test/resources/testng.xml b/testsuite/deployment-testsuite/deployment-tests/src/test/resources/testng.xml
deleted file mode 100644
index 181e13a..0000000
--- a/testsuite/deployment-testsuite/deployment-tests/src/test/resources/testng.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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$ -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-
-<suite name="Suite1" verbose="1">
- <test name="deployment-testsuite.deployment">
- <packages>
- <package name="org.apache.geronimo.testsuite.deployment"/>
- </packages>
- </test>
-</suite>
diff --git a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml b/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
deleted file mode 100644
index ca2a81b..0000000
--- a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?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.testsuite</groupId>
- <artifactId>jca-cms-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jca-cms-ear</artifactId>
- <name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security EAR</name>
- <packaging>ear</packaging>
-
- <!--
- FIXME: Split this module up... one to build the ear, one to run the tests.
- -->
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>system-database</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jca-cms-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>Manifest Classpath Itest ear</displayName>
- <description>Manifest Classpath Itest ear</description>
- <version>1.4</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jca-cms-war</artifactId>
- <contextRoot>/jca-cms</contextRoot>
- <bundleFileName>web.war</bundleFileName>
- </webModule>
- <rarModule>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <bundleFileName>tranql.rar</bundleFileName>
- </rarModule>
- </modules>
- </configuration>
- </plugin>
-
- <!-- "ear" packaging doesn't compile test classes -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- "ear" packaging doesn't process test resources -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testResources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ears</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
- <execution>
- <id>undeploy-ear-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml b/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
deleted file mode 100644
index c5b2bd5..0000000
--- a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?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$ -->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </moduleId>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
- </environment>
-
- <module>
- <connector>tranql.rar</connector>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>cmsds</name>
- <!--<config-property-setting name="UserName"></config-property-setting>-->
- <!--<config-property-setting name="Password"></config-property-setting>-->
- <config-property-setting name="DatabaseName">TestDatabase</config-property-setting>
- <config-property-setting name="CreateDatabase">false</config-property-setting>
- <connectionmanager>
- <container-managed-security/>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>10</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <select-one-assume-match/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- <connectiondefinition-instance>
- <name>configuredsecurityds</name>
- <config-property-setting name="UserName">system</config-property-setting>
- <config-property-setting name="Password">manager</config-property-setting>
- <config-property-setting name="DatabaseName">TestDatabase</config-property-setting>
- <config-property-setting name="CreateDatabase">true</config-property-setting>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>10</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <select-one-assume-match/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
- <gbean name="test-cms-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
- <attribute name="realmName">test-cms-realm</attribute>
- <xml-reference name="LoginModuleConfiguration" xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-1.1">
- <lc:login-config>
- <lc:login-module-ref control-flag="REQUIRED">
- <lc:pattern>
- <name xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">test-cms-credentials
- </name>
- </lc:pattern>
- </lc:login-module-ref>
- <lc:login-module control-flag="REQUIRED" wrap-principals="false">
- <lc:login-domain-name>test-app-credentials</lc:login-domain-name>
- <lc:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</lc:login-module-class>
- <lc:option name="usersURI">var/security/demo_users.properties</lc:option>
- <lc:option name="groupsURI">var/security/demo_groups.properties</lc:option>
- </lc:login-module>
- </lc:login-config>
- </xml-reference>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
- <gbean name="test-cms-credentials"
- class="org.apache.geronimo.connector.wrapper.outbound.security.PasswordCredentialLoginModuleWrapper">
- <attribute name="loginModuleClass">
- org.apache.geronimo.connector.wrapper.outbound.security.CallerIdentityPasswordCredentialLoginModule
- </attribute>
- <reference name="ManagedConnectionFactoryWrapper">
- <name>cmsds</name>
- </reference>
- <attribute name="loginDomainName">test-cms-credentials</attribute>
- </gbean>
- </connector>
- </module>
- <module>
- <web>web.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
- <security-realm-name>test-cms-realm</security-realm-name>
- <security xmlns="http://geronimo.apache.org/xml/ns/security-2.0">
- <credential-store-ref>
- <name xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">test-credential-store</name>
- </credential-store-ref>
- <default-subject>
- <realm>test-cms-realm</realm>
- <id>test</id>
- </default-subject>
- <role-mappings>
- <role role-name="test">
- <principal class="org.apache.geronimo.connector.outbound.security.ResourcePrincipal" name="george"/>
- </role>
- <role role-name="fail">
- <run-as-subject>
- <realm>test-cms-realm</realm>
- <id>fail</id>
- </run-as-subject>
- </role>
- </role-mappings>
- </security>
- </web-app>
- </module>
- <gbean name="test-credential-store" class="org.apache.geronimo.security.credentialstore.SimpleCredentialStoreImpl">
- <xml-attribute name="credentialStore">
- <credential-store xmlns="http://geronimo.apache.org/xml/ns/credentialstore-1.0">
- <realm name="test-cms-realm">
- <subject>
- <id>test</id>
- <credential>
- <type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</type>
- <value>george</value>
- </credential>
- <credential>
- <type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</type>
- <value>bone</value>
- </credential>
- </subject>
- <subject>
- <id>fail</id>
- <credential>
- <type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</type>
- <value>gracie</value>
- </credential>
- <credential>
- <type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</type>
- <value>biscuit</value>
- </credential>
- </subject>
- </realm>
- </credential-store>
- </xml-attribute>
- <dependency>
- <name>test-cms-realm</name>
- </dependency>
- </gbean>
-</application>
diff --git a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java b/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java
deleted file mode 100644
index b58dc14..0000000
--- a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.geronimo.testsuite.jcacms;
-
-import org.apache.geronimo.testsupport.SeleniumTestSupport;
-import org.testng.annotations.Test;
-
-/**
- * ???
- *
- * @version $Rev$ $Date$
- */
-@Test
-public class CmsTest
- extends SeleniumTestSupport
-{
- @Test
- public void testPageContent1() throws Exception {
- selenium.open("http://localhost:8080/jca-cms/default-subject-servlet");
- waitForPageLoad();
-
- String body = selenium.getText("xpath=/html/body");
-
- assertTrue(body.endsWith(
-// "Current subject: Subject:\n" +
-// "\tPrincipal: org.apache.geronimo.connector.outbound.security.ResourcePrincipal@cb1c722f\n" +
-// "\tPrincipal: org.apache.geronimo.security.IdentificationPrincipal[[1186174499145:0x607c7eb7837eabcd6b759e6f9d29e7eee72622d6]]\n" +
-// "\tPrincipal: org.apache.geronimo.security.IdentificationPrincipal[[1186174499146:0x7622e0831ed59a4cd6c277a53491de74f1489311]]\n" +
-// "\tPrivate Credential: javax.resource.spi.security.PasswordCredential@23f33e5c\n" +
-// "\n" +
-// "Next subject: Subject:\n" +
-// "\tPrincipal: org.apache.geronimo.connector.outbound.security.ResourcePrincipal@cb1c722f\n" +
-// "\tPrincipal: org.apache.geronimo.security.IdentificationPrincipal[[1186174499145:0x607c7eb7837eabcd6b759e6f9d29e7eee72622d6]]\n" +
-// "\tPrincipal: org.apache.geronimo.security.IdentificationPrincipal[[1186174499146:0x7622e0831ed59a4cd6c277a53491de74f1489311]]\n" +
-// "\tPrivate Credential: javax.resource.spi.security.PasswordCredential@23f33e5c\n" +
-// "\n" +
- "Successfully got configured connection\n" +
- "\n" +
- "Successfully got container managed connection"));
-
- String expectedPrincipal = "Principal: george";
- int pos1 = body.indexOf(expectedPrincipal);
- assertTrue("Expected current subject principal", pos1 > 0);
- int pos2 = body.indexOf(expectedPrincipal, pos1 + expectedPrincipal.length());
- assertTrue("Expected next subject principal", pos2 > 0);
- }
-
- @Test
- public void testPageContent2() throws Exception {
- selenium.open("http://localhost:8080/jca-cms/run-as-servlet");
- waitForPageLoad();
-
- String body = selenium.getText("xpath=/html/body");
-
- assertTrue(body.endsWith(
- "Successfully got configured connection\n" +
- "\n" +
- "Successfully got container managed connection"));
-
- String expectedPrincipal = "Principal: george";
- int pos1 = body.indexOf(expectedPrincipal);
- assertTrue("Expected current subject principal", pos1 > 0);
- int pos2 = body.indexOf("Principal: gracie", pos1 + expectedPrincipal.length());
- assertTrue("Expected next subject principal", pos2 > 0);
- }
-}
-
diff --git a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/resources/testng.xml b/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/resources/testng.xml
deleted file mode 100644
index b9c4677..0000000
--- a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/resources/testng.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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$ -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-
-<suite name="Suite1" verbose="1">
- <test name="deployment-testsuite.jca-cms">
- <packages>
- <package name="org.apache.geronimo.testsuite.jcacms"/>
- </packages>
- </test>
-</suite>
diff --git a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml b/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
deleted file mode 100644
index f75fe1a..0000000
--- a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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.testsuite</groupId>
- <artifactId>jca-cms-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jca-cms-war</artifactId>
- <name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security WAR</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/java/org/apache/geronimo/itest/TestServlet.java b/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
deleted file mode 100644
index f6bba46..0000000
--- a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * 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.
- */
-package org.apache.geronimo.itest;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.security.Principal;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import javax.sql.DataSource;
-import javax.annotation.Resource;
-import javax.security.auth.Subject;
-
-import org.apache.geronimo.security.Callers;
-import org.apache.geronimo.security.ContextManager;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestServlet extends HttpServlet {
-
- @Resource(name="configuredsecurityds")
- private DataSource csds;
- @Resource(name="cmsds")
- private DataSource cmsds;
-
- public void init() {
- System.out.println("Test Servlet init");
- }
-
- protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- Callers callers = ContextManager.getCallers();
- Subject current = callers.getCurrentCaller();
- Subject next = callers.getNextCaller();
- PrintWriter out = response.getWriter();
- out.println("Current subject: " + current);
- out.println("Next subject: " + next);
- //this should create the database
- if (csds == null) {
- out.println("No configured datasource found");
- return;
- }
- try {
- Connection con = csds.getConnection();
- con.close();
- out.println("Successfully got configured connection\n");
- } catch (SQLException e) {
- out.println("Could not get configured connection");
- e.printStackTrace(out);
- }
- //now get a connection through the configured default subject
- if (cmsds == null) {
- out.println("No container managed datasource found");
- return;
- }
- try {
- Connection con = cmsds.getConnection();
- DatabaseMetaData md = con.getMetaData();
- ResultSet rs = md.getSchemas();
- while (rs.next()) {
- String schema = rs.getString(1);
- for (Principal p: next.getPrincipals()) {
- String user = p.getName();
- if (schema.equals(user)) {
- out.println("expected schema: " + user);
- }
- }
- }
- rs.close();
- con.close();
- out.println("Successfully got container managed connection");
- } catch (SQLException e) {
- out.println("Could not get container managed connection");
- e.printStackTrace(out);
- }
- }
-
-
-}
diff --git a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/web.xml b/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index a2208b0..0000000
--- a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4"
- >
-
- <display-name>Geronimo Manifest Classpath Itest War</display-name>
-
- <servlet>
- <display-name>J2CA container managed security itest servlet</display-name>
- <servlet-name>servlet</servlet-name>
- <servlet-class>org.apache.geronimo.itest.TestServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet>
- <display-name>J2CA container managed security itest servlet with run-as</display-name>
- <servlet-name>run-as-servlet</servlet-name>
- <servlet-class>org.apache.geronimo.itest.TestServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- <run-as>
- <role-name>fail</role-name>
- </run-as>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>servlet</servlet-name>
- <url-pattern>/default-subject-servlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>servlet</servlet-name>
- <url-pattern>/secured-servlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>run-as-servlet</servlet-name>
- <url-pattern>/run-as-servlet</url-pattern>
- </servlet-mapping>
-
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>j2ca cms</realm-name>
- </login-config>
-
- <security-role>
- <role-name>test</role-name>
- </security-role>
- <security-role>
- <role-name>fail</role-name>
- </security-role>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>All</web-resource-name>
- <url-pattern>/secured-servlet</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>test</role-name>
- </auth-constraint>
- </security-constraint>
-
-</web-app>
diff --git a/testsuite/deployment-testsuite/jca-cms-tests/pom.xml b/testsuite/deployment-testsuite/jca-cms-tests/pom.xml
deleted file mode 100644
index adfaa23..0000000
--- a/testsuite/deployment-testsuite/jca-cms-tests/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.testsuite</groupId>
- <artifactId>deployment-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jca-cms-tests</artifactId>
- <packaging>pom</packaging>
- <name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security Test</name>
-
- <modules>
- <module>jca-cms-war</module>
- <module>jca-cms-ear</module>
- </modules>
-
-</project>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
deleted file mode 100644
index d009a7f..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>manifestcp-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>manifestcp-ear</artifactId>
- <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath EAR</name>
- <packaging>ear</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>manifestcp-jar</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>manifestcp-war-jar</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>manifestcp-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>manifestcp-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>Manifest Classpath Itest ear</displayName>
- <description>Manifest Classpath Itest ear</description>
- <version>1.4</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>manifestcp-war</artifactId>
- <contextRoot>/manifestcp</contextRoot>
- <bundleFileName>web.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>manifestcp-ejb</artifactId>
- <bundleFileName>ejb.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ears</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
- <execution>
- <id>undeploy-ear-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/META-INF/geronimo-application.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
deleted file mode 100644
index 019f979..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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$ -->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </moduleId>
- </environment>
-
-</application>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
deleted file mode 100644
index 75d3939..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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.testsuite</groupId>
- <artifactId>manifestcp-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>manifestcp-ejb</artifactId>
- <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath EJB</name>
- <packaging>ejb</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>manifestcp-jar</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/src/main/resources/META-INF/ejb-jar.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index dafe210..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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.
--->
-<ejb-jar version="2.1"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Manifest Classpath itest ejb</display-name>
- <enterprise-beans>
- <session>
- <description>Manifest Classpath Itest ejb</description>
- <display-name>TestSession</display-name>
- <ejb-name>TestSession</ejb-name>
- <home>org.apache.geronimo.itest.TestSessionHome</home>
- <remote>org.apache.geronimo.itest.TestSession</remote>
- <ejb-class>org.apache.geronimo.itest.TestSessionBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
deleted file mode 100644
index d90c015..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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.testsuite</groupId>
- <artifactId>manifestcp-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>manifestcp-jar</artifactId>
- <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath JAR</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>manifestcp-jar2</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/src/main/java/org/apache/geronimo/itest/TestSession.java b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/src/main/java/org/apache/geronimo/itest/TestSession.java
deleted file mode 100644
index d6a262b..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/src/main/java/org/apache/geronimo/itest/TestSession.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * 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.
- */
-package org.apache.geronimo.itest;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TestSession extends javax.ejb.EJBObject {
-}
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/src/main/java/org/apache/geronimo/itest/TestSessionBean.java b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/src/main/java/org/apache/geronimo/itest/TestSessionBean.java
deleted file mode 100644
index 4bc1125..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/src/main/java/org/apache/geronimo/itest/TestSessionBean.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * 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.
- */
-package org.apache.geronimo.itest;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.SessionBean;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestSessionBean implements SessionBean, BaseInterface {
-
- public void ejbCreate() {
- System.out.println("TestSessionBean");
- }
-
- public void ejbActivate() throws EJBException, RemoteException {
- }
-
- public void ejbPassivate() throws EJBException, RemoteException {
- }
-
- public void ejbRemove() throws EJBException, RemoteException {
- }
-
- public void setSessionContext(SessionContext sessionContext) throws EJBException, RemoteException {
- }
-}
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/src/main/java/org/apache/geronimo/itest/TestSessionHome.java b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/src/main/java/org/apache/geronimo/itest/TestSessionHome.java
deleted file mode 100644
index f50db86..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/src/main/java/org/apache/geronimo/itest/TestSessionHome.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * 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.
- */
-package org.apache.geronimo.itest;
-
-import java.rmi.RemoteException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TestSessionHome extends javax.ejb.EJBHome {
-
- public TestSession create( ) throws RemoteException;
-
-}
\ No newline at end of file
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
deleted file mode 100644
index 758c743..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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.testsuite</groupId>
- <artifactId>manifestcp-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>manifestcp-jar2</artifactId>
- <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath JAR</name>
-
-</project>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/src/main/java/org/apache/geronimo/itest/Base.java b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/src/main/java/org/apache/geronimo/itest/Base.java
deleted file mode 100644
index 3323b0f..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/src/main/java/org/apache/geronimo/itest/Base.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * 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.
- */
-package org.apache.geronimo.itest;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Base {
-}
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/src/main/java/org/apache/geronimo/itest/BaseInterface.java b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/src/main/java/org/apache/geronimo/itest/BaseInterface.java
deleted file mode 100644
index 7e8a183..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/src/main/java/org/apache/geronimo/itest/BaseInterface.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * 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.
- */
-package org.apache.geronimo.itest;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface BaseInterface {
-}
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
deleted file mode 100644
index 2cc3c5e..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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.testsuite</groupId>
- <artifactId>manifestcp-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>manifestcp-war-jar</artifactId>
- <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath WAR-JAR</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>manifestcp-jar2</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/src/main/java/org/apache/geronimo/itest/TestServlet.java b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/src/main/java/org/apache/geronimo/itest/TestServlet.java
deleted file mode 100644
index bc12efc..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/src/main/java/org/apache/geronimo/itest/TestServlet.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * 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.
- */
-package org.apache.geronimo.itest;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestServlet extends HttpServlet implements BaseInterface{
-
- public void init() {
- System.out.println("Test Servlet init");
- }
-
- protected void service(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException {
- httpServletResponse.getWriter().print("TestServlet");
- httpServletResponse.flushBuffer();
- }
-
-
-}
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
deleted file mode 100644
index 62a12b9..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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.testsuite</groupId>
- <artifactId>manifestcp-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>manifestcp-war</artifactId>
- <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath WAR</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>manifestcp-war-jar</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/src/main/webapp/WEB-INF/web.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 73e7628..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4"
- >
-
- <display-name>Geronimo Manifest Classpath Itest War</display-name>
-
- <servlet>
- <display-name>Manifest ClassPath itest servlet</display-name>
- <servlet-name>servlet</servlet-name>
- <servlet-class>org.apache.geronimo.itest.TestServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>servlet</servlet-name>
- <url-pattern>/servlet</url-pattern>
- </servlet-mapping>
-
-</web-app>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/pom.xml
deleted file mode 100644
index f456f92..0000000
--- a/testsuite/deployment-testsuite/manifestcp-tests/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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.testsuite</groupId>
- <artifactId>deployment-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>manifestcp-tests</artifactId>
- <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath Test</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>manifestcp-jar2</module>
- <module>manifestcp-jar</module>
- <module>manifestcp-war-jar</module>
- <module>manifestcp-ejb</module>
- <module>manifestcp-war</module>
- <module>manifestcp-ear</module>
- </modules>
-
-</project>
diff --git a/testsuite/deployment-testsuite/pom.xml b/testsuite/deployment-testsuite/pom.xml
deleted file mode 100644
index 8c33f94..0000000
--- a/testsuite/deployment-testsuite/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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.testsuite</groupId>
- <artifactId>testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>deployment-testsuite</artifactId>
- <name>Geronimo TestSuite :: Deployment Testsuite</name>
- <packaging>pom</packaging>
-
- <description>
- Geronimo deployment testsuite.
- </description>
-
- <modules>
- <module>deployment-tests</module>
- <module>jca-cms-tests</module>
- <module>manifestcp-tests</module>
- </modules>
-
- <profiles>
- <profile>
- <id>all-subprojects</id>
- <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
- <modules>
- <module>deployment-tests</module>
- <module>jca-cms-tests</module>
- <module>manifestcp-tests</module>
- </modules>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/web-testsuite/pom.xml b/testsuite/web-testsuite/pom.xml
index c5f6998..7d517b7 100644
--- a/testsuite/web-testsuite/pom.xml
+++ b/testsuite/web-testsuite/pom.xml
@@ -50,33 +50,4 @@
<module>test-tld</module>
<module>test-myfaces</module>
</modules>
-
- <profiles>
- <profile>
- <id>testsuite-with-jetty</id>
- <activation>
- <property>
- <name>assemblyId</name>
- <value>jetty</value>
- </property>
- </activation>
- <modules>
- <module>test-jetty</module>
- </modules>
- </profile>
-
- <profile>
- <id>testsuite-with-tomcat</id>
- <activation>
- <property>
- <name>assemblyId</name>
- <value>tomcat</value>
- </property>
- </activation>
- <modules>
- <module>test-tomcat</module>
- </modules>
- </profile>
- </profiles>
-
</project>
