[jboss-cvs] JBossAS SVN: r102080 - in projects/metadata/client/tags: 2.0.0.Alpha2 and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 8 14:57:47 EST 2010
Author: bstansberry at jboss.com
Date: 2010-03-08 14:57:46 -0500 (Mon, 08 Mar 2010)
New Revision: 102080
Added:
projects/metadata/client/tags/2.0.0.Alpha2/
projects/metadata/client/tags/2.0.0.Alpha2/LICENSE.txt
projects/metadata/client/tags/2.0.0.Alpha2/pom.xml
projects/metadata/client/tags/2.0.0.Alpha2/src/
projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/jboss/JBossClient6MetaData.java
projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/spec/ApplicationClient6MetaData.java
projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java
projects/metadata/client/tags/2.0.0.Alpha2/src/main/resources/schema/application-client_6.xsd
projects/metadata/client/tags/2.0.0.Alpha2/src/main/resources/schema/jboss-client_6_0.xsd
projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/ApplicationClient6EverythingUnitTestCase.java
projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/JBossClient6EverythingUnitTestCase.java
projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/org/jboss/test/metadata/client/ApplicationClient6Everything_testEverything.xml
projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/org/jboss/test/metadata/client/JBossClient6Everything_testEverything.xml
projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/schema2class.properties
Removed:
projects/metadata/client/tags/2.0.0.Alpha2/LICENSE.txt
projects/metadata/client/tags/2.0.0.Alpha2/pom.xml
projects/metadata/client/tags/2.0.0.Alpha2/src/
projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java
projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/schema2class.properties
Log:
[maven-release-plugin] copy for tag 2.0.0.Alpha2
Copied: projects/metadata/client/tags/2.0.0.Alpha2 (from rev 102076, projects/metadata/client/trunk)
Deleted: projects/metadata/client/tags/2.0.0.Alpha2/LICENSE.txt
===================================================================
--- projects/metadata/client/trunk/LICENSE.txt 2010-03-08 18:55:25 UTC (rev 102076)
+++ projects/metadata/client/tags/2.0.0.Alpha2/LICENSE.txt 2010-03-08 19:57:46 UTC (rev 102080)
@@ -1,458 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-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 and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, 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 library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete 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 distribute a copy of this License along with the
-Library.
-
- 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 Library or any portion
-of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-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 Library, 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 Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you 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.
-
- If distribution of 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 satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be 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.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library 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.
-
- 9. 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 Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-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 with
-this License.
-
- 11. 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 Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library 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 Library.
-
-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.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library 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.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser 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 Library
-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 Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-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
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "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
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. 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 LIBRARY 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
-LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
Copied: projects/metadata/client/tags/2.0.0.Alpha2/LICENSE.txt (from rev 102002, projects/metadata/client/trunk/LICENSE.txt)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/LICENSE.txt (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/LICENSE.txt 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,458 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+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 and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, 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 library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete 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 distribute a copy of this License along with the
+Library.
+
+ 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 Library or any portion
+of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+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 Library, 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 Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you 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.
+
+ If distribution of 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 satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be 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.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library 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.
+
+ 9. 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 Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+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 with
+this License.
+
+ 11. 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 Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library 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 Library.
+
+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.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library 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.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+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 Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+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
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. 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 LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
Deleted: projects/metadata/client/tags/2.0.0.Alpha2/pom.xml
===================================================================
--- projects/metadata/client/trunk/pom.xml 2010-03-08 18:55:25 UTC (rev 102076)
+++ projects/metadata/client/tags/2.0.0.Alpha2/pom.xml 2010-03-08 19:57:46 UTC (rev 102080)
@@ -1,125 +0,0 @@
-<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.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>4.0.CR1</version>
- </parent>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-client</artifactId>
- <packaging>jar</packaging>
- <version>2.0.0-SNAPSHOT</version>
- <name>JBoss Metadata Client</name>
- <url>http://www.jboss.org</url>
- <description>The common JavaEE metadata classes</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/client/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/client/trunk/</developerConnection>
- </scm>
-
- <build>
- <outputDirectory>${profile.outputDirectory}</outputDirectory>
- <testOutputDirectory>${profile.testOutputDirectory}</testOutputDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <!--
- Eclipse settings have been removed from parent. This needs to be
- done via an eclipse profile.
- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4085896#4085896
- -->
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <profile.outputDirectory>target/classes</profile.outputDirectory>
- <profile.testOutputDirectory>target/tests-classes</profile.testOutputDirectory>
- </properties>
- </profile>
-
- <profile>
- <id>eclipse</id>
- <properties>
- <profile.outputDirectory>eclipse-target/classes</profile.outputDirectory>
- <profile.testOutputDirectory>eclipse-target/tests-classes</profile.testOutputDirectory>
- </properties>
- </profile>
- </profiles>
-
- <!-- Compile Dependencies -->
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-common</artifactId>
- <version>2.0.0.Alpha14</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-common</artifactId>
- <version>2.0.0.Alpha14</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.1.4.GA</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
Copied: projects/metadata/client/tags/2.0.0.Alpha2/pom.xml (from rev 102079, projects/metadata/client/trunk/pom.xml)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/pom.xml (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/pom.xml 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,125 @@
+<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.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4.0.CR1</version>
+ </parent>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-client</artifactId>
+ <packaging>jar</packaging>
+ <version>2.0.0.Alpha2</version>
+ <name>JBoss Metadata Client</name>
+ <url>http://www.jboss.org</url>
+ <description>The common JavaEE metadata classes</description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/client/tags/2.0.0.Alpha2</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/client/tags/2.0.0.Alpha2</developerConnection>
+ </scm>
+
+ <build>
+ <outputDirectory>${profile.outputDirectory}</outputDirectory>
+ <testOutputDirectory>${profile.testOutputDirectory}</testOutputDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <!--
+ Eclipse settings have been removed from parent. This needs to be
+ done via an eclipse profile.
+ http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4085896#4085896
+ -->
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <profile.outputDirectory>target/classes</profile.outputDirectory>
+ <profile.testOutputDirectory>target/tests-classes</profile.testOutputDirectory>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>eclipse</id>
+ <properties>
+ <profile.outputDirectory>eclipse-target/classes</profile.outputDirectory>
+ <profile.testOutputDirectory>eclipse-target/tests-classes</profile.testOutputDirectory>
+ </properties>
+ </profile>
+ </profiles>
+
+ <!-- Compile Dependencies -->
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-common</artifactId>
+ <version>2.0.0.Alpha14</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-common</artifactId>
+ <version>2.0.0.Alpha14</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.1.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src (from rev 102002, projects/metadata/client/trunk/src)
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/jboss/JBossClient6MetaData.java (from rev 102076, projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient6MetaData.java)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/jboss/JBossClient6MetaData.java (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/jboss/JBossClient6MetaData.java 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.client.jboss;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * JBoss specific meta data for JavaEE 6 clients.
+ *
+ * @author Brian Stansberry
+ * @version $Revision: 84989 $
+ */
+ at XmlRootElement(name="jboss-client", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JBOSS_NS, prefix = "jboss"),
+ @XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee"),
+ @XmlNs(namespaceURI = JavaEEMetaDataConstants.XSD_NS, prefix = "xsd")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace=JavaEEMetaDataConstants.JBOSS_NS,
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
+ at XmlType(name="jboss-clientType", namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"moduleName", "callbackHandler", "metadataComplete",
+ "descriptionGroup", "jndiName", "environmentRefsGroup", "messageDestinations", "depends"})
+public class JBossClient6MetaData extends JBossClientMetaData
+{
+ private static final long serialVersionUID = -4180526338768209252L;
+
+ @Override
+ @XmlAttribute(name="module-name")
+ public void setModuleName(String moduleName)
+ {
+ super.setModuleName(moduleName);
+ }
+
+}
\ No newline at end of file
Deleted: projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
===================================================================
--- projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2010-03-05 22:48:26 UTC (rev 102002)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2010-03-08 19:57:46 UTC (rev 102080)
@@ -1,535 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.client.jboss;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
-
-import org.jboss.metadata.client.spec.ApplicationClientMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnvironmentRefsGroupMetaData;
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
-import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
-import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
-import org.jboss.metadata.javaee.spec.Environment;
-import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
-import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
-import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
-import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
-import org.jboss.metadata.javaee.spec.RemoteEnvironment;
-import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
-import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
-import org.jboss.metadata.javaee.support.IdMetaData;
-import org.jboss.metadata.javaee.support.IdMetaDataImpl;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-
-/**
- * The jboss javaee client application metadata
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 84989 $
- */
-public class JBossClientMetaData extends IdMetaDataImplWithDescriptionGroup
- implements RemoteEnvironment
-{
- private static final long serialVersionUID = 1L;
-
- /** The jndi name for the client environment */
- private String jndiName;
-
- /** The environment */
- private JBossEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
- /** A list of extra dependencies to wait on */
- private List<String> depends;
- /** The legacy dtd public id */
- private String dtdPublicId;
- /** The legacy dtd system id */
- private String dtdSystemId;
- /** The version of the jboss client descriptor */
- private String version;
- /** The callback handler */
- private String callbackHandler;
- /** Whether the spec metadata is complete */
- private boolean metaDataComplete;
- /** The message destinations */
- private MessageDestinationsMetaData messageDestinations;
-
- /**
- * Callback for the DTD information
- * @param root
- * @param publicId
- * @param systemId
- */
- @XmlTransient
- public void setDTD(String root, String publicId, String systemId)
- {
- this.dtdPublicId = publicId;
- this.dtdSystemId = systemId;
- // Set the version from legacy public ids
- if(dtdPublicId != null)
- {
- if(dtdPublicId.contains("3.0"))
- setVersion("3.0");
- if(dtdPublicId.contains("3.2"))
- setVersion("3.2");
- if(dtdPublicId.contains("4.0"))
- setVersion("4.0");
- if(dtdPublicId.contains("4.2"))
- setVersion("4.2");
- if(dtdPublicId.contains("5.0"))
- setVersion("5.0");
- }
- }
- /**
- * Get the DTD public id if one was seen
- * @return the value of the web.xml dtd public id
- */
- @XmlTransient
- public String getDtdPublicId()
- {
- return dtdPublicId;
- }
- /**
- * Get the DTD system id if one was seen
- * @return the value of the web.xml dtd system id
- */
- @XmlTransient
- public String getDtdSystemId()
- {
- return dtdSystemId;
- }
-
-
- public String getVersion()
- {
- return version;
- }
- @XmlAttribute(name="version")
- public void setVersion(String version)
- {
- this.version = version;
- }
-
-
- public boolean isMetadataComplete()
- {
- return metaDataComplete;
- }
- public void setMetadataComplete(boolean metaDataComplete)
- {
- this.metaDataComplete = metaDataComplete;
- }
- public String getCallbackHandler()
- {
- return callbackHandler;
- }
- public void setCallbackHandler(String callbackHandler)
- {
- this.callbackHandler = callbackHandler;
- }
-
- public List<String> getDepends()
- {
- return depends;
- }
- public void setDepends(List<String> depends)
- {
- this.depends = depends;
- }
-
- public String getJndiName()
- {
- return jndiName;
- }
- public void setJndiName(String jndiName)
- {
- this.jndiName = jndiName;
- }
-
- public Environment getJndiEnvironmentRefsGroup()
- {
- return jndiEnvironmentRefsGroup;
- }
-
- @XmlTransient
- public void setJndiEnvironmentRefsGroup(Environment jndiEnvironmentRefsGroup)
- {
- if(jndiEnvironmentRefsGroup == null)
- throw new IllegalArgumentException("jndiEnvironmentRefsGroup is null");
- this.jndiEnvironmentRefsGroup = (JBossEnvironmentRefsGroupMetaData) jndiEnvironmentRefsGroup;
- }
-
- // for xml binding to expose the correct model group type
- public void setEnvironmentRefsGroup(JBossEnvironmentRefsGroupMetaData env)
- {
- this.setJndiEnvironmentRefsGroup(env);
- }
-
- // Convinence accessors
-
- /**
- * Get a message destination
- *
- * @param name the name of the destination
- * @return the destination or null if not found
- */
- public MessageDestinationMetaData getMessageDestinationByName(String name)
- {
- if (messageDestinations == null)
- return null;
- return messageDestinations.get(name);
- }
- public MessageDestinationsMetaData getMessageDestinations()
- {
- return messageDestinations;
- }
- public void setMessageDestinations(
- MessageDestinationsMetaData messageDestinations)
- {
- this.messageDestinations = messageDestinations;
- }
- @XmlTransient
- public EJBReferenceMetaData getEjbReferenceByName(String name)
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getEjbReferenceByName(name);
- }
-
- @XmlTransient
- public EJBReferencesMetaData getEjbReferences()
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getEjbReferences();
- }
- // TODO?
- @XmlTransient
- public AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences()
- {
- AnnotatedEJBReferencesMetaData refs = null;
- if(jndiEnvironmentRefsGroup != null)
- refs = jndiEnvironmentRefsGroup.getAnnotatedEjbReferences();
- return refs;
- }
-
- @XmlTransient
- public EnvironmentEntriesMetaData getEnvironmentEntries()
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getEnvironmentEntries();
- }
-
- @XmlTransient
- public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getEnvironmentEntryByName(name);
- }
-
- @XmlTransient
- public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getMessageDestinationReferenceByName(name);
- }
-
- @XmlTransient
- public MessageDestinationReferencesMetaData getMessageDestinationReferences()
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getMessageDestinationReferences();
- }
-
- @XmlTransient
- public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getPersistenceUnitReferenceByName(name);
- }
-
- @XmlTransient
- public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getPersistenceUnitRefs();
- }
-
- @XmlTransient
- public LifecycleCallbacksMetaData getPostConstructs()
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getPostConstructs();
- }
-
- @XmlTransient
- public LifecycleCallbacksMetaData getPreDestroys()
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getPreDestroys();
- }
-
- @XmlTransient
- public ServiceReferenceMetaData getServiceReferenceByName(String name)
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getServiceReferenceByName(name);
- }
-
- @XmlTransient
- public ServiceReferencesMetaData getServiceReferences()
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getServiceReferences();
- }
-
- @XmlTransient
- public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getResourceEnvironmentReferenceByName(name);
- }
-
- @XmlTransient
- public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getResourceEnvironmentReferences();
- }
-
- @XmlTransient
- public ResourceReferenceMetaData getResourceReferenceByName(String name)
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getResourceReferenceByName(name);
- }
-
- @XmlTransient
- public ResourceReferencesMetaData getResourceReferences()
- {
- if(jndiEnvironmentRefsGroup == null)
- return null;
- return jndiEnvironmentRefsGroup.getResourceReferences();
- }
-
- @Override
- public void merge(IdMetaData override, IdMetaData original)
- {
- throw new RuntimeException("wrong merge method called");
- }
-
- @Override
- public void merge(IdMetaDataImpl override, IdMetaDataImpl original)
- {
- throw new RuntimeException("wrong merge method called");
- }
-
- /**
- * Merge jboss + spec into this
- * @param jboss
- * @param spec
- */
- public void merge(JBossClientMetaData jboss, ApplicationClientMetaData spec, boolean mustOverride)
- {
- super.merge(jboss, spec);
-
- RemoteEnvironmentRefsGroupMetaData jbossEnv = null;
- RemoteEnvironmentRefsGroupMetaData specEnv = null;
- MessageDestinationsMetaData jbossMsgs = null;
- MessageDestinationsMetaData specMsgs = null;
- if(jboss != null)
- {
- if(jboss.depends != null)
- setDepends(jboss.depends);
- if(jboss.jndiName != null)
- this.setJndiName(jboss.jndiName);
- else if(jboss.getDescriptionGroup() != null && jboss.getDescriptionGroup().getDisplayName() != null)
- this.setJndiName(jboss.getDescriptionGroup().getDisplayName());
- if(jboss.dtdPublicId != null)
- this.dtdPublicId = jboss.dtdPublicId;
- if(jboss.dtdSystemId != null)
- this.dtdSystemId = jboss.dtdSystemId;
- if(jboss.version != null)
- this.version = jboss.version;
- jbossEnv = jboss.jndiEnvironmentRefsGroup;
- jbossMsgs = jboss.getMessageDestinations();
- }
- if(spec != null)
- {
- specEnv = spec.getJndiEnvironmentRefsGroup();
- specMsgs = spec.getMessageDestinations();
- if(jndiName == null && spec.getDescriptionGroup() != null && spec.getDescriptionGroup().getDisplayName() != null)
- setJndiName(spec.getDescriptionGroup().getDisplayName());
- metaDataComplete = spec.isMetadataComplete();
- specMsgs = spec.getMessageDestinations();
- }
-
- if(jboss != null && jboss.callbackHandler != null)
- this.setCallbackHandler(jboss.callbackHandler);
- else if(spec != null && spec.getCallbackHandler() != null)
- this.setCallbackHandler(spec.getCallbackHandler());
-
- if(jndiEnvironmentRefsGroup == null)
- jndiEnvironmentRefsGroup = new JBossEnvironmentRefsGroupMetaData();
- jndiEnvironmentRefsGroup.merge(jbossEnv, specEnv, "jboss-client.xml", "application-client.xml", false);
-
- // Get the merged resource-env-refs
- ResourceEnvironmentReferencesMetaData resEnvRefs = jndiEnvironmentRefsGroup.getResourceEnvironmentReferences();
-
- // Merge the message-destinations
- messageDestinations = MessageDestinationsMetaData.merge(jbossMsgs, specMsgs, "jboss-client.xml", "application-client.xml");
-
- /* Need to map message-destinations to resource-env-refs for legacy
- * descriptors that did not have message-destinations
- */
- if(messageDestinations != null && resEnvRefs != null)
- {
- for(MessageDestinationMetaData md : messageDestinations)
- {
- if(md.getMappedName() == null)
- {
- ResourceEnvironmentReferenceMetaData ref = resEnvRefs.get(md.getMessageDestinationName());
- if(ref != null)
- md.setMappedName(ref.getMappedName());
- }
- }
- }
-
- /** A HashMap<String, ArrayList<MessageDestinationReferenceMetaData>> of
- * message-destination-ref that resolve to a jndi-name via a message-destination
- * via a message-destination-link
- */
- HashMap<String, ArrayList<MessageDestinationReferenceMetaData>> resourceEnvReferenceLinks
- = new HashMap<String, ArrayList<MessageDestinationReferenceMetaData>>();
- /* Merge the message-destination-ref elements
- This is a bit convoluted because legacy jboss descriptors did not support
- message-destination-ref elements.
- A message-destination-ref is linked to a jndi-name either via
- the message-destination-ref/message-destination-ref-name mapping to
- a jboss resource-env-ref/resource-env-ref-name if there is no
- message-destination-link, or by the message-destination-link ->
- message-destination/message-destination-name mapping to a jboss
- resource-env-ref/resource-env-ref-name.
- */
- if(specEnv != null)
- {
- ResourceEnvironmentReferencesMetaData specEnvRefs = specEnv.getResourceEnvironmentReferences();
- MessageDestinationReferencesMetaData specMsgRefs = specEnv.getMessageDestinationReferences();
- MessageDestinationReferencesMetaData msgRefs = jndiEnvironmentRefsGroup.getMessageDestinationReferences();
- if(msgRefs == null)
- {
- msgRefs = new MessageDestinationReferencesMetaData();
- jndiEnvironmentRefsGroup.setMessageDestinationReferences(msgRefs);
- }
- if(specMsgRefs != null)
- for(MessageDestinationReferenceMetaData ref : specMsgRefs)
- {
- ref = (MessageDestinationReferenceMetaData)ref.clone();
- String link = ref.getLink();
- if (link != null)
- {
- ArrayList<MessageDestinationReferenceMetaData> linkedRefs = resourceEnvReferenceLinks.get(link);
- if (linkedRefs == null)
- {
- linkedRefs = new ArrayList<MessageDestinationReferenceMetaData>();
- resourceEnvReferenceLinks.put(link, linkedRefs);
- }
- linkedRefs.add(ref);
- }
- if(msgRefs.contains(ref) == false)
- msgRefs.add(ref);
- else
- {
- MessageDestinationReferenceMetaData existingRef = msgRefs.get(ref.getMessageDestinationRefName());
- existingRef.merge(null, ref);
- }
- }
-
- // Merge the spec resource-env-refs
- if(resEnvRefs != null && specEnvRefs != null)
- for(ResourceEnvironmentReferenceMetaData ref : resEnvRefs)
- {
- String resRefName = ref.getResourceEnvRefName();
- ResourceEnvironmentReferenceMetaData specRef = specEnvRefs.get(resRefName);
- if (specRef == null)
- {
- // Try the resourceEnvReferenceLinks
- ArrayList<MessageDestinationReferenceMetaData> linkedRefs = resourceEnvReferenceLinks.get(resRefName);
- if (linkedRefs != null)
- {
- for(MessageDestinationReferenceMetaData mref : linkedRefs)
- {
- // Need to make sure this is the ref in the map
- MessageDestinationReferenceMetaData existingRef = msgRefs.get(mref.getMessageDestinationRefName());
- if(existingRef.getIgnoreDependency() != null)
- ref.setIgnoreDependency(mref.getIgnoreDependency());
- if(existingRef.getType() != null)
- ref.setType(mref.getType());
- existingRef.setMappedName(ref.getMappedName());
- }
- }
- else if(msgRefs.containsKey(resRefName))
- {
- MessageDestinationReferenceMetaData mref = msgRefs.get(resRefName);
- mref.setMappedName(ref.getMappedName());
- }
- else
- {
- throw new IllegalStateException("resource-env-ref " + resRefName + " found in jboss-client.xml but not in application-client.xml");
- }
- }
- else
- {
- // Merge the spec ref into the jboss ref
- ref.merge(null, specRef);
- }
- }
- }
-
- }
-}
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java (from rev 102076, projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,550 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.client.jboss;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.jboss.metadata.client.spec.ApplicationClientMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
+import org.jboss.metadata.javaee.spec.Environment;
+import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
+import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironment;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+import org.jboss.metadata.javaee.support.IdMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
+import org.jboss.metadata.javaee.support.NamedModuleImpl;
+
+/**
+ * The jboss javaee client application metadata
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 84989 $
+ */
+public class JBossClientMetaData extends NamedModuleImpl
+ implements RemoteEnvironment
+{
+ private static final long serialVersionUID = 1L;
+
+ /** The jndi name for the client environment */
+ private String jndiName;
+
+ /** The environment */
+ private JBossEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
+ /** A list of extra dependencies to wait on */
+ private List<String> depends;
+ /** The legacy dtd public id */
+ private String dtdPublicId;
+ /** The legacy dtd system id */
+ private String dtdSystemId;
+ /** The version of the jboss client descriptor */
+ private String version;
+ /** The callback handler */
+ private String callbackHandler;
+ /** Whether the spec metadata is complete */
+ private boolean metaDataComplete;
+ /** The message destinations */
+ private MessageDestinationsMetaData messageDestinations;
+
+ /**
+ * Callback for the DTD information
+ * @param root
+ * @param publicId
+ * @param systemId
+ */
+ @XmlTransient
+ public void setDTD(String root, String publicId, String systemId)
+ {
+ this.dtdPublicId = publicId;
+ this.dtdSystemId = systemId;
+ // Set the version from legacy public ids
+ if(dtdPublicId != null)
+ {
+ if(dtdPublicId.contains("3.0"))
+ setVersion("3.0");
+ if(dtdPublicId.contains("3.2"))
+ setVersion("3.2");
+ if(dtdPublicId.contains("4.0"))
+ setVersion("4.0");
+ if(dtdPublicId.contains("4.2"))
+ setVersion("4.2");
+ if(dtdPublicId.contains("5.0"))
+ setVersion("5.0");
+ }
+ }
+ /**
+ * Get the DTD public id if one was seen
+ * @return the value of the web.xml dtd public id
+ */
+ @XmlTransient
+ public String getDtdPublicId()
+ {
+ return dtdPublicId;
+ }
+ /**
+ * Get the DTD system id if one was seen
+ * @return the value of the web.xml dtd system id
+ */
+ @XmlTransient
+ public String getDtdSystemId()
+ {
+ return dtdSystemId;
+ }
+
+
+ public String getVersion()
+ {
+ return version;
+ }
+ @XmlAttribute(name="version")
+ public void setVersion(String version)
+ {
+ this.version = version;
+ }
+
+
+ public boolean isMetadataComplete()
+ {
+ return metaDataComplete;
+ }
+ public void setMetadataComplete(boolean metaDataComplete)
+ {
+ this.metaDataComplete = metaDataComplete;
+ }
+ public String getCallbackHandler()
+ {
+ return callbackHandler;
+ }
+ public void setCallbackHandler(String callbackHandler)
+ {
+ this.callbackHandler = callbackHandler;
+ }
+
+ public List<String> getDepends()
+ {
+ return depends;
+ }
+ public void setDepends(List<String> depends)
+ {
+ this.depends = depends;
+ }
+
+ public String getJndiName()
+ {
+ return jndiName;
+ }
+ public void setJndiName(String jndiName)
+ {
+ this.jndiName = jndiName;
+ }
+
+ public Environment getJndiEnvironmentRefsGroup()
+ {
+ return jndiEnvironmentRefsGroup;
+ }
+
+ @XmlTransient
+ public void setJndiEnvironmentRefsGroup(Environment jndiEnvironmentRefsGroup)
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ throw new IllegalArgumentException("jndiEnvironmentRefsGroup is null");
+ this.jndiEnvironmentRefsGroup = (JBossEnvironmentRefsGroupMetaData) jndiEnvironmentRefsGroup;
+ }
+
+ // for xml binding to expose the correct model group type
+ public void setEnvironmentRefsGroup(JBossEnvironmentRefsGroupMetaData env)
+ {
+ this.setJndiEnvironmentRefsGroup(env);
+ }
+
+ // Convinence accessors
+
+ /**
+ * Get a message destination
+ *
+ * @param name the name of the destination
+ * @return the destination or null if not found
+ */
+ public MessageDestinationMetaData getMessageDestinationByName(String name)
+ {
+ if (messageDestinations == null)
+ return null;
+ return messageDestinations.get(name);
+ }
+ public MessageDestinationsMetaData getMessageDestinations()
+ {
+ return messageDestinations;
+ }
+ public void setMessageDestinations(
+ MessageDestinationsMetaData messageDestinations)
+ {
+ this.messageDestinations = messageDestinations;
+ }
+ @XmlTransient
+ public EJBReferenceMetaData getEjbReferenceByName(String name)
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getEjbReferenceByName(name);
+ }
+
+ @XmlTransient
+ public EJBReferencesMetaData getEjbReferences()
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getEjbReferences();
+ }
+ // TODO?
+ @XmlTransient
+ public AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences()
+ {
+ AnnotatedEJBReferencesMetaData refs = null;
+ if(jndiEnvironmentRefsGroup != null)
+ refs = jndiEnvironmentRefsGroup.getAnnotatedEjbReferences();
+ return refs;
+ }
+
+ @XmlTransient
+ public EnvironmentEntriesMetaData getEnvironmentEntries()
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getEnvironmentEntries();
+ }
+
+ @XmlTransient
+ public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getEnvironmentEntryByName(name);
+ }
+
+ @XmlTransient
+ public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getMessageDestinationReferenceByName(name);
+ }
+
+ @XmlTransient
+ public MessageDestinationReferencesMetaData getMessageDestinationReferences()
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getMessageDestinationReferences();
+ }
+
+ @XmlTransient
+ public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getPersistenceUnitReferenceByName(name);
+ }
+
+ @XmlTransient
+ public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getPersistenceUnitRefs();
+ }
+
+ @XmlTransient
+ public LifecycleCallbacksMetaData getPostConstructs()
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getPostConstructs();
+ }
+
+ @XmlTransient
+ public LifecycleCallbacksMetaData getPreDestroys()
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getPreDestroys();
+ }
+
+ @XmlTransient
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getServiceReferenceByName(name);
+ }
+
+ @XmlTransient
+ public ServiceReferencesMetaData getServiceReferences()
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getServiceReferences();
+ }
+
+ @XmlTransient
+ public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getResourceEnvironmentReferenceByName(name);
+ }
+
+ @XmlTransient
+ public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getResourceEnvironmentReferences();
+ }
+
+ @XmlTransient
+ public ResourceReferenceMetaData getResourceReferenceByName(String name)
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getResourceReferenceByName(name);
+ }
+
+ @XmlTransient
+ public ResourceReferencesMetaData getResourceReferences()
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ return null;
+ return jndiEnvironmentRefsGroup.getResourceReferences();
+ }
+
+ @Override
+ public void merge(IdMetaData override, IdMetaData original)
+ {
+ throw new RuntimeException("wrong merge method called");
+ }
+
+ @Override
+ public void merge(IdMetaDataImpl override, IdMetaDataImpl original)
+ {
+ throw new RuntimeException("wrong merge method called");
+ }
+
+ @Override
+ public void merge(IdMetaDataImplWithDescriptionGroup override, IdMetaDataImplWithDescriptionGroup original)
+ {
+ throw new RuntimeException("wrong merge method called");
+ }
+
+ @Override
+ public void merge(NamedModuleImpl override, NamedModuleImpl original)
+ {
+ throw new RuntimeException("wrong merge method called");
+ }
+
+ /**
+ * Merge jboss + spec into this
+ * @param jboss
+ * @param spec
+ */
+ public void merge(JBossClientMetaData jboss, ApplicationClientMetaData spec, boolean mustOverride)
+ {
+ super.merge(jboss, spec);
+
+ mergeModuleName(jboss, spec);
+
+ RemoteEnvironmentRefsGroupMetaData jbossEnv = null;
+ RemoteEnvironmentRefsGroupMetaData specEnv = null;
+ MessageDestinationsMetaData jbossMsgs = null;
+ MessageDestinationsMetaData specMsgs = null;
+ if(jboss != null)
+ {
+ if(jboss.depends != null)
+ setDepends(jboss.depends);
+ if(jboss.jndiName != null)
+ this.setJndiName(jboss.jndiName);
+ else if(jboss.getDescriptionGroup() != null && jboss.getDescriptionGroup().getDisplayName() != null)
+ this.setJndiName(jboss.getDescriptionGroup().getDisplayName());
+ if(jboss.dtdPublicId != null)
+ this.dtdPublicId = jboss.dtdPublicId;
+ if(jboss.dtdSystemId != null)
+ this.dtdSystemId = jboss.dtdSystemId;
+ if(jboss.version != null)
+ this.version = jboss.version;
+ jbossEnv = jboss.jndiEnvironmentRefsGroup;
+ jbossMsgs = jboss.getMessageDestinations();
+ }
+ if(spec != null)
+ {
+ specEnv = spec.getJndiEnvironmentRefsGroup();
+ specMsgs = spec.getMessageDestinations();
+ if(jndiName == null && spec.getDescriptionGroup() != null && spec.getDescriptionGroup().getDisplayName() != null)
+ setJndiName(spec.getDescriptionGroup().getDisplayName());
+ metaDataComplete = spec.isMetadataComplete();
+ specMsgs = spec.getMessageDestinations();
+ }
+
+ if(jboss != null && jboss.callbackHandler != null)
+ this.setCallbackHandler(jboss.callbackHandler);
+ else if(spec != null && spec.getCallbackHandler() != null)
+ this.setCallbackHandler(spec.getCallbackHandler());
+
+ if(jndiEnvironmentRefsGroup == null)
+ jndiEnvironmentRefsGroup = new JBossEnvironmentRefsGroupMetaData();
+ jndiEnvironmentRefsGroup.merge(jbossEnv, specEnv, "jboss-client.xml", "application-client.xml", false);
+
+ // Get the merged resource-env-refs
+ ResourceEnvironmentReferencesMetaData resEnvRefs = jndiEnvironmentRefsGroup.getResourceEnvironmentReferences();
+
+ // Merge the message-destinations
+ messageDestinations = MessageDestinationsMetaData.merge(jbossMsgs, specMsgs, "jboss-client.xml", "application-client.xml");
+
+ /* Need to map message-destinations to resource-env-refs for legacy
+ * descriptors that did not have message-destinations
+ */
+ if(messageDestinations != null && resEnvRefs != null)
+ {
+ for(MessageDestinationMetaData md : messageDestinations)
+ {
+ if(md.getMappedName() == null)
+ {
+ ResourceEnvironmentReferenceMetaData ref = resEnvRefs.get(md.getMessageDestinationName());
+ if(ref != null)
+ md.setMappedName(ref.getMappedName());
+ }
+ }
+ }
+
+ /** A HashMap<String, ArrayList<MessageDestinationReferenceMetaData>> of
+ * message-destination-ref that resolve to a jndi-name via a message-destination
+ * via a message-destination-link
+ */
+ HashMap<String, ArrayList<MessageDestinationReferenceMetaData>> resourceEnvReferenceLinks
+ = new HashMap<String, ArrayList<MessageDestinationReferenceMetaData>>();
+ /* Merge the message-destination-ref elements
+ This is a bit convoluted because legacy jboss descriptors did not support
+ message-destination-ref elements.
+ A message-destination-ref is linked to a jndi-name either via
+ the message-destination-ref/message-destination-ref-name mapping to
+ a jboss resource-env-ref/resource-env-ref-name if there is no
+ message-destination-link, or by the message-destination-link ->
+ message-destination/message-destination-name mapping to a jboss
+ resource-env-ref/resource-env-ref-name.
+ */
+ if(specEnv != null)
+ {
+ ResourceEnvironmentReferencesMetaData specEnvRefs = specEnv.getResourceEnvironmentReferences();
+ MessageDestinationReferencesMetaData specMsgRefs = specEnv.getMessageDestinationReferences();
+ MessageDestinationReferencesMetaData msgRefs = jndiEnvironmentRefsGroup.getMessageDestinationReferences();
+ if(msgRefs == null)
+ {
+ msgRefs = new MessageDestinationReferencesMetaData();
+ jndiEnvironmentRefsGroup.setMessageDestinationReferences(msgRefs);
+ }
+ if(specMsgRefs != null)
+ for(MessageDestinationReferenceMetaData ref : specMsgRefs)
+ {
+ ref = (MessageDestinationReferenceMetaData)ref.clone();
+ String link = ref.getLink();
+ if (link != null)
+ {
+ ArrayList<MessageDestinationReferenceMetaData> linkedRefs = resourceEnvReferenceLinks.get(link);
+ if (linkedRefs == null)
+ {
+ linkedRefs = new ArrayList<MessageDestinationReferenceMetaData>();
+ resourceEnvReferenceLinks.put(link, linkedRefs);
+ }
+ linkedRefs.add(ref);
+ }
+ if(msgRefs.contains(ref) == false)
+ msgRefs.add(ref);
+ else
+ {
+ MessageDestinationReferenceMetaData existingRef = msgRefs.get(ref.getMessageDestinationRefName());
+ existingRef.merge(null, ref);
+ }
+ }
+
+ // Merge the spec resource-env-refs
+ if(resEnvRefs != null && specEnvRefs != null)
+ for(ResourceEnvironmentReferenceMetaData ref : resEnvRefs)
+ {
+ String resRefName = ref.getResourceEnvRefName();
+ ResourceEnvironmentReferenceMetaData specRef = specEnvRefs.get(resRefName);
+ if (specRef == null)
+ {
+ // Try the resourceEnvReferenceLinks
+ ArrayList<MessageDestinationReferenceMetaData> linkedRefs = resourceEnvReferenceLinks.get(resRefName);
+ if (linkedRefs != null)
+ {
+ for(MessageDestinationReferenceMetaData mref : linkedRefs)
+ {
+ // Need to make sure this is the ref in the map
+ MessageDestinationReferenceMetaData existingRef = msgRefs.get(mref.getMessageDestinationRefName());
+ if(existingRef.getIgnoreDependency() != null)
+ ref.setIgnoreDependency(mref.getIgnoreDependency());
+ if(existingRef.getType() != null)
+ ref.setType(mref.getType());
+ existingRef.setMappedName(ref.getMappedName());
+ }
+ }
+ else if(msgRefs.containsKey(resRefName))
+ {
+ MessageDestinationReferenceMetaData mref = msgRefs.get(resRefName);
+ mref.setMappedName(ref.getMappedName());
+ }
+ else
+ {
+ throw new IllegalStateException("resource-env-ref " + resRefName + " found in jboss-client.xml but not in application-client.xml");
+ }
+ }
+ else
+ {
+ // Merge the spec ref into the jboss ref
+ ref.merge(null, specRef);
+ }
+ }
+ }
+
+ }
+}
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/spec/ApplicationClient6MetaData.java (from rev 102076, projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient6MetaData.java)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/spec/ApplicationClient6MetaData.java (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/spec/ApplicationClient6MetaData.java 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.client.spec;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Application client meta data for Java EE 6 clients. See JavaEE 6 chapter 10.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 81860 $
+ */
+ at XmlRootElement(name="application-client", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
+ at XmlType(name="application-clientType",
+ namespace=JavaEEMetaDataConstants.JAVAEE_NS, propOrder={"moduleName", "descriptionGroup", "jndiEnvironmentRefsGroup", "callbackHandler", "messageDestinations"})
+public class ApplicationClient6MetaData extends ApplicationClientMetaData
+{
+ private static final long serialVersionUID = 1914939966505073042L;
+
+ @Override
+ @XmlAttribute(name="module-name")
+ public void setModuleName(String moduleName)
+ {
+ super.setModuleName(moduleName);
+ }
+
+ @Override
+ @XmlAttribute(name="version")
+ public void setVersion(String version)
+ {
+ super.setVersion(version);
+ }
+
+}
Deleted: projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java
===================================================================
--- projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java 2010-03-05 22:48:26 UTC (rev 102002)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java 2010-03-08 19:57:46 UTC (rev 102080)
@@ -1,299 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.client.spec;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
-import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
-import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
-import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
-import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
-import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
-import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
-import org.jboss.metadata.javaee.spec.RemoteEnvironment;
-import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
-import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
-import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-
-/**
- * The common application client meta data for all JavaEE and J2EE versions.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: 75470 $
- */
-public class ApplicationClientMetaData extends IdMetaDataImplWithDescriptionGroup implements RemoteEnvironment
-{
- private static final long serialVersionUID = 1;
- /** The environment */
- private RemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
-
- private String dtdPublicId;
- private String dtdSystemId;
- /** The version of the client */
- private String version;
- /** The callback handler */
- private String callbackHandler;
- /** The metadata-complete attribute */
- private boolean metadataComplete;
-
- /** The message destinations */
- private MessageDestinationsMetaData messageDestinations;
-
- /**
- * Callback for the DTD information
- * @param root
- * @param publicId
- * @param systemId
- */
- @XmlTransient
- public void setDTD(String root, String publicId, String systemId)
- {
- this.dtdPublicId = publicId;
- this.dtdSystemId = systemId;
- // Set the version from legacy public ids
- if(dtdPublicId != null)
- {
- if(dtdPublicId.contains("1.2"))
- setVersion("1.2");
- if(dtdPublicId.contains("1.3"))
- setVersion("1.3");
- }
- }
- /**
- * Get the DTD public id if one was seen
- * @return the value of the web.xml dtd public id
- */
- @XmlTransient
- public String getDtdPublicId()
- {
- return dtdPublicId;
- }
- /**
- * Get the DTD system id if one was seen
- * @return the value of the web.xml dtd system id
- */
- @XmlTransient
- public String getDtdSystemId()
- {
- return dtdSystemId;
- }
-
-
- public String getVersion()
- {
- return version;
- }
- public void setVersion(String version)
- {
- this.version = version;
- }
-
-
- public boolean isMetadataComplete()
- {
- return metadataComplete;
- }
- @XmlAttribute(name="metadata-complete")
- public void setMetadataComplete(boolean metadataComplete)
- {
- this.metadataComplete = metadataComplete;
- }
-
- public String getCallbackHandler()
- {
- return callbackHandler;
- }
-
- public EJBReferenceMetaData getEjbReferenceByName(String name)
- {
- return AbstractMappedMetaData.getByName(name, getEjbReferences());
- }
-
- public EJBReferencesMetaData getEjbReferences()
- {
- if (jndiEnvironmentRefsGroup != null)
- return jndiEnvironmentRefsGroup.getEjbReferences();
- return null;
- }
- // TODO?
- @XmlTransient
- public AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences()
- {
- AnnotatedEJBReferencesMetaData refs = null;
- if(jndiEnvironmentRefsGroup != null)
- refs = jndiEnvironmentRefsGroup.getAnnotatedEjbReferences();
- return refs;
- }
-
- public EnvironmentEntriesMetaData getEnvironmentEntries()
- {
- if (jndiEnvironmentRefsGroup != null)
- return jndiEnvironmentRefsGroup.getEnvironmentEntries();
- return null;
- }
-
- public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
- {
- return AbstractMappedMetaData.getByName(name, getEnvironmentEntries());
- }
-
- public RemoteEnvironmentRefsGroupMetaData getJndiEnvironmentRefsGroup()
- {
- return jndiEnvironmentRefsGroup;
- }
-
- /**
- * Get a message destination
- *
- * @param name the name of the destination
- * @return the destination or null if not found
- */
- public MessageDestinationMetaData getMessageDestinationByName(String name)
- {
- if (messageDestinations == null)
- return null;
- return messageDestinations.get(name);
- }
-
- public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
- {
- return AbstractMappedMetaData.getByName(name, getMessageDestinationReferences());
- }
-
- public MessageDestinationReferencesMetaData getMessageDestinationReferences()
- {
- if (jndiEnvironmentRefsGroup != null)
- return jndiEnvironmentRefsGroup.getMessageDestinationReferences();
- return null;
- }
-
- /**
- * Get the messageDestinations.
- *
- * @return the messageDestinations.
- */
- public MessageDestinationsMetaData getMessageDestinations()
- {
- return messageDestinations;
- }
-
- public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
- {
- return AbstractMappedMetaData.getByName(name, getResourceEnvironmentReferences());
- }
-
- public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
- {
- return AbstractMappedMetaData.getByName(name, getPersistenceUnitRefs());
- }
-
- public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
- {
- if(jndiEnvironmentRefsGroup != null)
- return jndiEnvironmentRefsGroup.getPersistenceUnitRefs();
- return null;
- }
-
- public LifecycleCallbacksMetaData getPostConstructs()
- {
- if (jndiEnvironmentRefsGroup != null)
- return jndiEnvironmentRefsGroup.getPostConstructs();
- return null;
- }
-
- public LifecycleCallbacksMetaData getPreDestroys()
- {
- if (jndiEnvironmentRefsGroup != null)
- return jndiEnvironmentRefsGroup.getPreDestroys();
- return null;
- }
-
- public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
- {
- if (jndiEnvironmentRefsGroup != null)
- return jndiEnvironmentRefsGroup.getResourceEnvironmentReferences();
- return null;
- }
-
- public ServiceReferenceMetaData getServiceReferenceByName(String name)
- {
- return AbstractMappedMetaData.getByName(name, getServiceReferences());
- }
- public ServiceReferencesMetaData getServiceReferences()
- {
- if (jndiEnvironmentRefsGroup != null)
- return jndiEnvironmentRefsGroup.getServiceReferences();
- return null;
- }
-
- public ResourceReferenceMetaData getResourceReferenceByName(String name)
- {
- return AbstractMappedMetaData.getByName(name, getResourceReferences());
- }
-
- public ResourceReferencesMetaData getResourceReferences()
- {
- if (jndiEnvironmentRefsGroup != null)
- return jndiEnvironmentRefsGroup.getResourceReferences();
- return null;
- }
-
- public void setCallbackHandler(String callbackHandler)
- {
- this.callbackHandler = callbackHandler;
- }
-
- public void setJndiEnvironmentRefsGroup(RemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup)
- {
- if (jndiEnvironmentRefsGroup == null)
- throw new IllegalArgumentException("Null jndiEnvironmentRefsGroup");
- this.jndiEnvironmentRefsGroup = jndiEnvironmentRefsGroup;
- }
-
- /**
- * Set the messageDestinations.
- *
- * @param messageDestinations the messageDestinations.
- * @throws IllegalArgumentException for a null messageDestinations
- */
- @XmlElement(name="message-destination")
- public void setMessageDestinations(MessageDestinationsMetaData messageDestinations)
- {
- if (messageDestinations == null)
- throw new IllegalArgumentException("Null messageDestinations");
- this.messageDestinations = messageDestinations;
- }
-}
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java (from rev 102076, projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,312 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.client.spec;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.jboss.metadata.javaee.jboss.NamedModule;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
+import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironment;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
+
+/**
+ * The common application client meta data for all JavaEE and J2EE versions.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: 75470 $
+ */
+public class ApplicationClientMetaData extends IdMetaDataImplWithDescriptionGroup implements RemoteEnvironment, NamedModule
+{
+ private static final long serialVersionUID = 1;
+ /** The environment */
+ private RemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
+
+ private String dtdPublicId;
+ private String dtdSystemId;
+ /** The version of the client */
+ private String version;
+ /** The callback handler */
+ private String callbackHandler;
+ /** The metadata-complete attribute */
+ private boolean metadataComplete;
+
+ /** The message destinations */
+ private MessageDestinationsMetaData messageDestinations;
+
+ private String moduleName;
+
+ /**
+ * Callback for the DTD information
+ * @param root
+ * @param publicId
+ * @param systemId
+ */
+ @XmlTransient
+ public void setDTD(String root, String publicId, String systemId)
+ {
+ this.dtdPublicId = publicId;
+ this.dtdSystemId = systemId;
+ // Set the version from legacy public ids
+ if(dtdPublicId != null)
+ {
+ if(dtdPublicId.contains("1.2"))
+ setVersion("1.2");
+ if(dtdPublicId.contains("1.3"))
+ setVersion("1.3");
+ }
+ }
+ /**
+ * Get the DTD public id if one was seen
+ * @return the value of the web.xml dtd public id
+ */
+ @XmlTransient
+ public String getDtdPublicId()
+ {
+ return dtdPublicId;
+ }
+ /**
+ * Get the DTD system id if one was seen
+ * @return the value of the web.xml dtd system id
+ */
+ @XmlTransient
+ public String getDtdSystemId()
+ {
+ return dtdSystemId;
+ }
+
+ public String getModuleName()
+ {
+ return moduleName;
+ }
+
+ public void setModuleName(String moduleName)
+ {
+ this.moduleName = moduleName;
+ }
+
+
+ public String getVersion()
+ {
+ return version;
+ }
+ public void setVersion(String version)
+ {
+ this.version = version;
+ }
+
+
+ public boolean isMetadataComplete()
+ {
+ return metadataComplete;
+ }
+ @XmlAttribute(name="metadata-complete")
+ public void setMetadataComplete(boolean metadataComplete)
+ {
+ this.metadataComplete = metadataComplete;
+ }
+
+ public String getCallbackHandler()
+ {
+ return callbackHandler;
+ }
+
+ public EJBReferenceMetaData getEjbReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getEjbReferences());
+ }
+
+ public EJBReferencesMetaData getEjbReferences()
+ {
+ if (jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getEjbReferences();
+ return null;
+ }
+ // TODO?
+ @XmlTransient
+ public AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences()
+ {
+ AnnotatedEJBReferencesMetaData refs = null;
+ if(jndiEnvironmentRefsGroup != null)
+ refs = jndiEnvironmentRefsGroup.getAnnotatedEjbReferences();
+ return refs;
+ }
+
+ public EnvironmentEntriesMetaData getEnvironmentEntries()
+ {
+ if (jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getEnvironmentEntries();
+ return null;
+ }
+
+ public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getEnvironmentEntries());
+ }
+
+ public RemoteEnvironmentRefsGroupMetaData getJndiEnvironmentRefsGroup()
+ {
+ return jndiEnvironmentRefsGroup;
+ }
+
+ /**
+ * Get a message destination
+ *
+ * @param name the name of the destination
+ * @return the destination or null if not found
+ */
+ public MessageDestinationMetaData getMessageDestinationByName(String name)
+ {
+ if (messageDestinations == null)
+ return null;
+ return messageDestinations.get(name);
+ }
+
+ public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getMessageDestinationReferences());
+ }
+
+ public MessageDestinationReferencesMetaData getMessageDestinationReferences()
+ {
+ if (jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getMessageDestinationReferences();
+ return null;
+ }
+
+ /**
+ * Get the messageDestinations.
+ *
+ * @return the messageDestinations.
+ */
+ public MessageDestinationsMetaData getMessageDestinations()
+ {
+ return messageDestinations;
+ }
+
+ public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getResourceEnvironmentReferences());
+ }
+
+ public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getPersistenceUnitRefs());
+ }
+
+ public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
+ {
+ if(jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getPersistenceUnitRefs();
+ return null;
+ }
+
+ public LifecycleCallbacksMetaData getPostConstructs()
+ {
+ if (jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getPostConstructs();
+ return null;
+ }
+
+ public LifecycleCallbacksMetaData getPreDestroys()
+ {
+ if (jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getPreDestroys();
+ return null;
+ }
+
+ public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
+ {
+ if (jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getResourceEnvironmentReferences();
+ return null;
+ }
+
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getServiceReferences());
+ }
+ public ServiceReferencesMetaData getServiceReferences()
+ {
+ if (jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getServiceReferences();
+ return null;
+ }
+
+ public ResourceReferenceMetaData getResourceReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getResourceReferences());
+ }
+
+ public ResourceReferencesMetaData getResourceReferences()
+ {
+ if (jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getResourceReferences();
+ return null;
+ }
+
+ public void setCallbackHandler(String callbackHandler)
+ {
+ this.callbackHandler = callbackHandler;
+ }
+
+ public void setJndiEnvironmentRefsGroup(RemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup)
+ {
+ if (jndiEnvironmentRefsGroup == null)
+ throw new IllegalArgumentException("Null jndiEnvironmentRefsGroup");
+ this.jndiEnvironmentRefsGroup = jndiEnvironmentRefsGroup;
+ }
+
+ /**
+ * Set the messageDestinations.
+ *
+ * @param messageDestinations the messageDestinations.
+ * @throws IllegalArgumentException for a null messageDestinations
+ */
+ @XmlElement(name="message-destination")
+ public void setMessageDestinations(MessageDestinationsMetaData messageDestinations)
+ {
+ if (messageDestinations == null)
+ throw new IllegalArgumentException("Null messageDestinations");
+ this.messageDestinations = messageDestinations;
+ }
+}
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src/main/resources/schema/application-client_6.xsd (from rev 102076, projects/metadata/client/trunk/src/main/resources/schema/application-client_6.xsd)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/src/main/resources/schema/application-client_6.xsd (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/main/resources/schema/application-client_6.xsd 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://java.sun.com/xml/ns/javaee"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="6">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
+
+ The contents of this file are subject to the terms of either the
+ GNU General Public License Version 2 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with
+ the License. You can obtain a copy of the License at
+ https://glassfish.dev.java.net/public/CDDL+GPL.html or
+ glassfish/bootstrap/legal/LICENSE.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License.
+
+ When distributing the software, include this License Header
+ Notice in each file and include the License file at
+ glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
+ particular file as subject to the "Classpath" exception as
+ provided by Sun in the GPL Version 2 section of the License file
+ that accompanied this code. If applicable, add the following
+ below the License Header, with the fields enclosed by brackets []
+ replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ If you wish your version of this file to be governed by only the
+ CDDL or only the GPL Version 2, indicate your decision by adding
+ "[Contributor] elects to include this software in this
+ distribution under the [CDDL or GPL Version 2] license." If you
+ don't indicate a single choice of license, a recipient has the
+ option to distribute your version of this file under either the
+ CDDL, the GPL Version 2 or to extend the choice of license to its
+ licensees as provided above. However, if you add GPL Version 2
+ code and therefore, elected the GPL Version 2 license, then the
+ option applies only if the new code is made subject to such
+ option by the copyright holder.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[[
+ This is the XML Schema for the application client 6
+ deployment descriptor. The deployment descriptor must
+ be named "META-INF/application-client.xml" in the
+ application client's jar file. All application client
+ deployment descriptors must indicate the application
+ client schema by using the Java EE namespace:
+
+ http://java.sun.com/xml/ns/javaee
+
+ and indicate the version of the schema by
+ using the version element as shown below:
+
+ <application-client xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application-client_6.xsd"
+ version="6">
+ ...
+ </application-client>
+
+ The instance documents may indicate the published version of
+ the schema using the xsi:schemaLocation attribute for Java EE
+ namespace with the following location:
+
+ http://java.sun.com/xml/ns/javaee/application-client_6.xsd
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The following conventions apply to all Java EE
+ deployment descriptor elements unless indicated otherwise.
+
+ - In elements that specify a pathname to a file within the
+ same JAR file, relative filenames (i.e., those not
+ starting with "/") are considered relative to the root of
+ the JAR file's namespace. Absolute filenames (i.e., those
+ starting with "/") also specify names in the root of the
+ JAR file's namespace. In general, relative names are
+ preferred. The exception is .war files where absolute
+ names are preferred for consistency with the Servlet API.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:include schemaLocation="javaee_6.xsd"/>
+
+
+<!-- **************************************************** -->
+
+ <xsd:element name="application-client"
+ type="javaee:application-clientType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The application-client element is the root element of an
+ application client deployment descriptor. The application
+ client deployment descriptor describes the EJB components
+ and external resources referenced by the application
+ client.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:unique name="env-entry-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The env-entry-name element contains the name of an
+ application client's environment entry. The name is a JNDI
+ name relative to the java:comp/env context. The name must
+ be unique within an application client.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="javaee:env-entry"/>
+ <xsd:field xpath="javaee:env-entry-name"/>
+ </xsd:unique>
+ <xsd:unique name="ejb-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-ref-name element contains the name of an EJB
+ reference. The EJB reference is an entry in the application
+ client's environment and is relative to the
+ java:comp/env context. The name must be unique within the
+ application client.
+
+ It is recommended that name is prefixed with "ejb/".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="javaee:ejb-ref"/>
+ <xsd:field xpath="javaee:ejb-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="res-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The res-ref-name element specifies the name of a
+ resource manager connection factory reference.The name
+ is a JNDI name relative to the java:comp/env context.
+ The name must be unique within an application client.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="javaee:resource-ref"/>
+ <xsd:field xpath="javaee:res-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="resource-env-ref-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The resource-env-ref-name element specifies the name of
+ a resource environment reference; its value is the
+ environment entry name used in the application client
+ code. The name is a JNDI name relative to the
+ java:comp/env context and must be unique within an
+ application client.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="javaee:resource-env-ref"/>
+ <xsd:field xpath="javaee:resource-env-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="message-destination-ref-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The message-destination-ref-name element specifies the
+ name of a message destination reference; its value is
+ the message destination reference name used in the
+ application client code. The name is a JNDI name
+ relative to the java:comp/env context and must be unique
+ within an application client.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="javaee:message-destination-ref"/>
+ <xsd:field xpath="javaee:message-destination-ref-name"/>
+ </xsd:unique>
+ </xsd:element>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="application-clientType">
+ <xsd:sequence>
+ <xsd:element name="module-name"
+ type="javaee:string"
+ minOccurs="0"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
+ <xsd:element name="env-entry"
+ type="javaee:env-entryType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="ejb-ref"
+ type="javaee:ejb-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:group ref="javaee:service-refGroup"/>
+ <xsd:element name="resource-ref"
+ type="javaee:resource-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="resource-env-ref"
+ type="javaee:resource-env-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="message-destination-ref"
+ type="javaee:message-destination-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="persistence-unit-ref"
+ type="javaee:persistence-unit-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="post-construct"
+ type="javaee:lifecycle-callbackType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="pre-destroy"
+ type="javaee:lifecycle-callbackType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="callback-handler"
+ type="javaee:fully-qualified-classType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The callback-handler element names a class provided by
+ the application. The class must have a no args
+ constructor and must implement the
+ javax.security.auth.callback.CallbackHandler
+ interface. The class will be instantiated by the
+ application client container and used by the container
+ to collect authentication information from the user.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="message-destination"
+ type="javaee:message-destinationType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="data-source"
+ type="javaee:data-sourceType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="version"
+ type="javaee:dewey-versionType"
+ fixed="6"
+ use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The required value for the version is 6.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="metadata-complete"
+ type="xsd:boolean">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The metadata-complete attribute defines whether this
+ deployment descriptor and other related deployment
+ descriptors for this module (e.g., web service
+ descriptors) are complete, or whether the class
+ files available to this module and packaged with
+ this application should be examined for annotations
+ that specify deployment information.
+
+ If metadata-complete is set to "true", the deployment
+ tool must ignore any annotations that specify deployment
+ information, which might be present in the class files
+ of the application.
+
+ If metadata-complete is not specified or is set to
+ "false", the deployment tool must examine the class
+ files of the application for annotations, as
+ specified by the specifications.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+</xsd:schema>
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src/main/resources/schema/jboss-client_6_0.xsd (from rev 102076, projects/metadata/client/trunk/src/main/resources/schema/jboss-client_6_0.xsd)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/src/main/resources/schema/jboss-client_6_0.xsd (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/main/resources/schema/jboss-client_6_0.xsd 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
+ xmlns:jee="http://java.sun.com/xml/ns/javaee"
+ targetNamespace="http://www.jboss.com/xml/ns/javaee"
+ version="6.0"
+ elementFormDefault="qualified"
+ >
+
+ <xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="http://java.sun.com/xml/ns/javaee/javaee_6.xsd"/>
+ <xsd:include schemaLocation="http://www.jboss.org/j2ee/schema/jboss-common_6_0.xsd"/>
+
+ <xsd:element name="jboss-client" type="jboss:jboss-clientType"/>
+
+ <xsd:complexType name="jboss-clientType">
+ <xsd:sequence>
+ <xsd:element name="module-name" type="xsd:string" minOccurs="0"/>
+ <xsd:group ref="jboss:descriptionGroup"/>
+ <xsd:element name="callback-handler" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="metadata-complete" type="xsd:boolean" minOccurs="0"/>
+ <xsd:element name="jndi-name" type="xsd:string" minOccurs="0"/>
+ <xsd:group ref="jboss:jndiEnvironmentRefsGroup"/>
+ <xsd:element name="message-destinations" type="jboss:message-destinationType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="depends" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:string"/>
+ <xsd:attribute name="version" type="xsd:string"/>
+ </xsd:complexType>
+
+</xsd:schema>
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/ApplicationClient6EverythingUnitTestCase.java (from rev 102076, projects/metadata/client/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient6EverythingUnitTestCase.java)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/ApplicationClient6EverythingUnitTestCase.java (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/ApplicationClient6EverythingUnitTestCase.java 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.metadata.client;
+
+import org.jboss.metadata.client.spec.ApplicationClient6MetaData;
+import org.jboss.metadata.client.spec.ApplicationClientMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
+
+/**
+ * Test all entries of an application client 5 descriptor.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: 88255 $
+ */
+public class ApplicationClient6EverythingUnitTestCase extends AbstractJavaEEEverythingTest
+{
+
+ public ApplicationClient6EverythingUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ protected void assertEverything(ApplicationClientMetaData appClientMetaData, Mode mode)
+ {
+ //assertEverythingWithAppMetaData(appClientMetaData);
+ assertEquals("spec-app-client", appClientMetaData.getModuleName());
+ assertEquals("6", appClientMetaData.getVersion());
+ assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
+ assertRemoteEnvironment("appClient", appClientMetaData, true, mode);
+ assertEquals("org.jboss.test.metadata.client.AppClientCallbackHandler", appClientMetaData.getCallbackHandler());
+ assertMessageDestinations5("appClientMessageDestination", 2, appClientMetaData.getMessageDestinations(), true);
+ }
+ protected void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
+ {
+ assertNotNull("no message destinations are set", messageDestinations);
+ assertEquals(size, messageDestinations.size());
+ int count = 1;
+ for(MessageDestinationMetaData messageDestinationMetaData : messageDestinations)
+ {
+ assertMessageDestination50(prefix + count, messageDestinationMetaData, Mode.SPEC);
+ count++;
+ }
+ }
+
+ public void testEverything() throws Exception
+ {
+ ApplicationClientMetaData appClientMetaData = unmarshal();
+ assertEverything(appClientMetaData, Mode.SPEC);
+ }
+
+ protected ApplicationClientMetaData unmarshal() throws Exception
+ {
+ return unmarshal(ApplicationClient6MetaData.class);
+ }
+}
Deleted: projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/client/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java 2010-03-05 22:48:26 UTC (rev 102002)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java 2010-03-08 19:57:46 UTC (rev 102080)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.metadata.client;
-
-import org.jboss.metadata.client.jboss.JBossClientMetaData;
-import org.jboss.metadata.client.spec.ApplicationClientMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
-import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-
-/**
- * Test all entries of an JBoss specific application client descriptor.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @author Scott.Stark at jboss.org
- * @version $Revision: 88255 $
- */
-public class ApplicationClientJBossMergeEverythingUnitTestCase extends AbstractJavaEEEverythingTest
-{
-
- public ApplicationClientJBossMergeEverythingUnitTestCase(String name)
- {
- super(name);
- }
-
- private void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
- {
- assertNotNull("no message destinations are set", messageDestinations);
- assertEquals(size, messageDestinations.size());
- int count = 1;
- for(MessageDestinationMetaData messageDestinationMetaData : messageDestinations)
- {
- assertMessageDestination50(prefix + count, messageDestinationMetaData, Mode.SPEC);
- count++;
- }
- }
-
- public void testAppClient5Everything() throws Exception
- {
- ApplicationClientMetaData appClientMetaData = unmarshal("ApplicationClient5Everything_testEverything.xml", ApplicationClientMetaData.class, null);
- new ApplicationClient5EverythingUnitTestCase("appClient").assertEverything(appClientMetaData, Mode.SPEC);
-
- JBossClientMetaData rawJBossMetaData = unmarshal("JBossClient5Everything_testEverything.xml", JBossClientMetaData.class, null);
- new JBossClient5EverythingUnitTestCase("jbossClient").assertEverything(rawJBossMetaData);
-
- JBossClientMetaData jbossClientMetaData = new JBossClientMetaData();
- jbossClientMetaData.merge(rawJBossMetaData, appClientMetaData, true);
-
- // TODO: should this work?
- assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
- assertRemoteEnvironment("appClient", jbossClientMetaData, true, Mode.JBOSS);
- assertEquals("org.jboss.test.metadata.client.AppClientCallbackHandler", jbossClientMetaData.getCallbackHandler());
- assertMessageDestinations5("appClientMessageDestination", 2, jbossClientMetaData.getMessageDestinations(), true);
- }
-
-}
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java (from rev 102076, projects/metadata/client/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.metadata.client;
+
+import org.jboss.metadata.client.jboss.JBossClientMetaData;
+import org.jboss.metadata.client.spec.ApplicationClientMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
+
+/**
+ * Test all entries of an JBoss specific application client descriptor.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 88255 $
+ */
+public class ApplicationClientJBossMergeEverythingUnitTestCase extends AbstractJavaEEEverythingTest
+{
+
+ public ApplicationClientJBossMergeEverythingUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ private void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
+ {
+ assertNotNull("no message destinations are set", messageDestinations);
+ assertEquals(size, messageDestinations.size());
+ int count = 1;
+ for(MessageDestinationMetaData messageDestinationMetaData : messageDestinations)
+ {
+ assertMessageDestination50(prefix + count, messageDestinationMetaData, Mode.SPEC);
+ count++;
+ }
+ }
+
+ public void testAppClient5Everything() throws Exception
+ {
+ ApplicationClientMetaData appClientMetaData = unmarshal("ApplicationClient5Everything_testEverything.xml", ApplicationClientMetaData.class, null);
+ new ApplicationClient5EverythingUnitTestCase("appClient").assertEverything(appClientMetaData, Mode.SPEC);
+
+ JBossClientMetaData rawJBossMetaData = unmarshal("JBossClient5Everything_testEverything.xml", JBossClientMetaData.class, null);
+ new JBossClient5EverythingUnitTestCase("jbossClient").assertEverything(rawJBossMetaData);
+
+ JBossClientMetaData jbossClientMetaData = new JBossClientMetaData();
+ jbossClientMetaData.merge(rawJBossMetaData, appClientMetaData, true);
+
+ // TODO: should this work?
+ assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
+ assertRemoteEnvironment("appClient", jbossClientMetaData, true, Mode.JBOSS);
+ assertEquals("org.jboss.test.metadata.client.AppClientCallbackHandler", jbossClientMetaData.getCallbackHandler());
+ assertMessageDestinations5("appClientMessageDestination", 2, jbossClientMetaData.getMessageDestinations(), true);
+ }
+
+ public void testAppClient6Everything() throws Exception
+ {
+ ApplicationClientMetaData appClientMetaData = unmarshal("ApplicationClient6Everything_testEverything.xml", ApplicationClientMetaData.class, null);
+ new ApplicationClient6EverythingUnitTestCase("appClient").assertEverything(appClientMetaData, Mode.SPEC);
+
+ JBossClientMetaData rawJBossMetaData = unmarshal("JBossClient6Everything_testEverything.xml", JBossClientMetaData.class, null);
+ new JBossClient6EverythingUnitTestCase("jbossClient").assertEverything(rawJBossMetaData);
+
+ JBossClientMetaData jbossClientMetaData = new JBossClientMetaData();
+ jbossClientMetaData.merge(rawJBossMetaData, appClientMetaData, true);
+
+ // TODO: should this work?
+ assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
+ assertRemoteEnvironment("appClient", jbossClientMetaData, true, Mode.JBOSS);
+ assertEquals("org.jboss.test.metadata.client.AppClientCallbackHandler", jbossClientMetaData.getCallbackHandler());
+ assertMessageDestinations5("appClientMessageDestination", 2, jbossClientMetaData.getMessageDestinations(), true);
+
+ assertEquals("jboss-app-client", jbossClientMetaData.getModuleName());
+
+ rawJBossMetaData.setModuleName(null);
+ jbossClientMetaData = new JBossClientMetaData();
+ jbossClientMetaData.merge(rawJBossMetaData, appClientMetaData, true);
+ assertEquals("spec-app-client", jbossClientMetaData.getModuleName());
+ }
+
+}
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/JBossClient6EverythingUnitTestCase.java (from rev 102076, projects/metadata/client/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient6EverythingUnitTestCase.java)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/JBossClient6EverythingUnitTestCase.java (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/test/java/org/jboss/test/metadata/client/JBossClient6EverythingUnitTestCase.java 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.metadata.client;
+
+import org.jboss.metadata.client.jboss.JBossClient5MetaData;
+import org.jboss.metadata.client.jboss.JBossClient6MetaData;
+import org.jboss.metadata.client.jboss.JBossClientMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
+import org.jboss.test.metadata.javaee.JBossXBTestDelegate;
+
+/**
+ * Test all entries of an JBoss client 5 descriptor.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: 88255 $
+ */
+public class JBossClient6EverythingUnitTestCase extends AbstractJavaEEEverythingTest
+{
+
+ public JBossClient6EverythingUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ protected void assertEverything(JBossClientMetaData jbossClientMetaData)
+ {
+ assertEquals("jboss-app-client", jbossClientMetaData.getModuleName());
+ assertEquals("appClientJndiName", jbossClientMetaData.getJndiName());
+ assertEquals("http://localhost", jbossClientMetaData.getJndiEnvironmentRefsGroup().getResourceReferences().get("appClientResourceRef2Name").getResUrl());
+ MessageDestinationReferenceMetaData mref = jbossClientMetaData.getMessageDestinationReferenceByName("appClientMessageDestinationRef1Name");
+ assertNotNull(mref);
+ assertEquals("MDB_QUEUE", mref.getJndiName());
+ assertEquals("MDB_QUEUE", mref.getMappedName());
+
+ assertEquals(2, jbossClientMetaData.getDepends().size());
+ int count = 1;
+ for(String depends : jbossClientMetaData.getDepends())
+ {
+ assertEquals("appClientDepends" + count, depends);
+ count++;
+ }
+ }
+
+ public void testEverything() throws Exception
+ {
+ JBossXBTestDelegate xbdelegate = (JBossXBTestDelegate) super.getDelegate();
+ xbdelegate.setValidateSchema(true);
+ JBossClient6MetaData jbossClientMetaData = unmarshal();
+ assertEverything(jbossClientMetaData);
+ }
+
+ /**
+ * When there is no jndiEnvironmentRefsGroup we don't want
+ * any NPE to pop up.
+ * @throws Exception
+ */
+ public void testNoJndiEnvironmentRefsGroup() throws Exception
+ {
+ JBossClientMetaData metaData = new JBossClient5MetaData();
+ assertNull(metaData.getJndiEnvironmentRefsGroup());
+ assertNull(metaData.getEjbReferences());
+ assertNull(metaData.getEjbReferenceByName("unknown"));
+ assertNull(metaData.getAnnotatedEjbReferences());
+ assertNull(metaData.getEnvironmentEntries());
+ assertNull(metaData.getEnvironmentEntryByName("unknown"));
+ assertNull(metaData.getMessageDestinationReferences());
+ assertNull(metaData.getMessageDestinationReferenceByName("unknown"));
+ assertNull(metaData.getPersistenceUnitRefs());
+ assertNull(metaData.getPersistenceUnitReferenceByName("unknown"));
+ assertNull(metaData.getPostConstructs());
+ assertNull(metaData.getPreDestroys());
+ assertNull(metaData.getServiceReferences());
+ assertNull(metaData.getServiceReferenceByName("unknown"));
+ assertNull(metaData.getResourceEnvironmentReferences());
+ assertNull(metaData.getResourceEnvironmentReferenceByName("unknown"));
+ assertNull(metaData.getResourceReferences());
+ assertNull(metaData.getResourceReferenceByName("unknown"));
+ }
+
+ protected JBossClient6MetaData unmarshal() throws Exception
+ {
+ return unmarshal(JBossClient6MetaData.class);
+ }
+}
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/org/jboss/test/metadata/client/ApplicationClient6Everything_testEverything.xml (from rev 102076, projects/metadata/client/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient6Everything_testEverything.xml)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/org/jboss/test/metadata/client/ApplicationClient6Everything_testEverything.xml (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/org/jboss/test/metadata/client/ApplicationClient6Everything_testEverything.xml 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_6.xsd"
+ version="6"
+ metadata-complete="true"
+ id="appclient-test">
+ <module-name>spec-app-client</module-name>
+ <!-- description group -->
+ <description>en-application-client-desc</description>
+ <description xml:lang="fr">fr-application-client-desc</description>
+ <description xml:lang="de">de-application-client-desc</description>
+ <display-name>en-application-client-disp</display-name>
+ <display-name xml:lang="fr">fr-application-client-disp</display-name>
+ <display-name xml:lang="de">de-application-client-disp</display-name>
+ <icon id="en-application-client-icon-id">
+ <small-icon>en-application-client-small-icon</small-icon>
+ <large-icon>en-application-client-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-application-client-icon-id">
+ <small-icon>fr-application-client-small-icon</small-icon>
+ <large-icon>fr-application-client-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-application-client-icon-id">
+ <small-icon>de-application-client-small-icon</small-icon>
+ <large-icon>de-application-client-large-icon</large-icon>
+ </icon>
+
+ <!-- env entry -->
+ <env-entry id="appClientEnvEntry1-id">
+ <description>en-appClientEnvEntry1-desc</description>
+ <description xml:lang="fr">fr-appClientEnvEntry1-desc</description>
+ <description xml:lang="de">de-appClientEnvEntry1-desc</description>
+ <env-entry-name>
+ appClientEnvEntry1Name
+ </env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>appClientEnvEntry1Value</env-entry-value>
+ <mapped-name>appClientEnvEntry1MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientEnvEntry1Injection1Class</injection-target-class>
+ <injection-target-name>appClientEnvEntry1Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientEnvEntry1Injection2Class</injection-target-class>
+ <injection-target-name>appClientEnvEntry1Injection2Name</injection-target-name>
+ </injection-target>
+ </env-entry>
+ <env-entry id="appClientEnvEntry2-id">
+ <description>en-appClientEnvEntry2-desc</description>
+ <description xml:lang="fr">fr-appClientEnvEntry2-desc</description>
+ <description xml:lang="de">de-appClientEnvEntry2-desc</description>
+ <env-entry-name>appClientEnvEntry2Name</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>appClientEnvEntry2Value</env-entry-value>
+ <mapped-name>appClientEnvEntry2MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientEnvEntry2Injection1Class</injection-target-class>
+ <injection-target-name>appClientEnvEntry2Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientEnvEntry2Injection2Class</injection-target-class>
+ <injection-target-name>appClientEnvEntry2Injection2Name</injection-target-name>
+ </injection-target>
+ </env-entry>
+
+ <!-- ejb ref -->
+ <ejb-ref id="appClientEjbRef1-id">
+ <description>en-appClientEjbRef1-desc</description>
+ <description xml:lang="fr">fr-appClientEjbRef1-desc</description>
+ <description xml:lang="de">de-appClientEjbRef1-desc</description>
+ <ejb-ref-name>appClientEjbRef1Name</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <home>appClientEjbRef1Home</home>
+ <remote>appClientEjbRef1Remote</remote>
+ <ejb-link>appClientEjbRef1EjbLink</ejb-link>
+ <mapped-name>appClientEjbRef1MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientEjbRef1Injection1Class</injection-target-class>
+ <injection-target-name>appClientEjbRef1Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientEjbRef1Injection2Class</injection-target-class>
+ <injection-target-name>appClientEjbRef1Injection2Name</injection-target-name>
+ </injection-target>
+ </ejb-ref>
+ <ejb-ref id="appClientEjbRef2-id">
+ <description>en-appClientEjbRef2-desc</description>
+ <description xml:lang="fr">fr-appClientEjbRef2-desc</description>
+ <description xml:lang="de">de-appClientEjbRef2-desc</description>
+ <ejb-ref-name>appClientEjbRef2Name</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <home>appClientEjbRef2Home</home>
+ <remote>appClientEjbRef2Remote</remote>
+ <ejb-link>appClientEjbRef2EjbLink</ejb-link>
+ <mapped-name>appClientEjbRef2MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientEjbRef2Injection1Class</injection-target-class>
+ <injection-target-name>appClientEjbRef2Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientEjbRef2Injection2Class</injection-target-class>
+ <injection-target-name>appClientEjbRef2Injection2Name</injection-target-name>
+ </injection-target>
+ </ejb-ref>
+
+ <!-- service ref -->
+ <!-- TODO: full service-ref contents -->
+ <service-ref id="appClientServiceRef1-id">
+ <description>en-appClientServiceRef1-desc</description>
+ <description xml:lang="fr">fr-appClientServiceRef1-desc</description>
+ <description xml:lang="de">de-appClientServiceRef1-desc</description>
+ <service-ref-name>appClientServiceRef1Name</service-ref-name>
+ <service-interface>appClientServiceRef1Iface</service-interface>
+ </service-ref>
+ <service-ref id="appClientServiceRef2-id">
+ <description>en-appClientServiceRef2-desc</description>
+ <description xml:lang="fr">fr-appClientServiceRef2-desc</description>
+ <description xml:lang="de">de-appClientServiceRef2-desc</description>
+ <service-ref-name>appClientServiceRef2Name</service-ref-name>
+ <service-interface>appClientServiceRef2Iface</service-interface>
+ </service-ref>
+
+ <!-- resource ref -->
+ <resource-ref id="appClientResourceRef1-id">
+ <description>en-appClientResourceRef1-desc</description>
+ <description xml:lang="fr">fr-appClientResourceRef1-desc</description>
+ <description xml:lang="de">de-appClientResourceRef1-desc</description>
+ <res-ref-name>appClientResourceRef1Name</res-ref-name>
+ <res-type>appClientResourceRef1Type</res-type>
+ <res-auth>Application</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ <mapped-name>appClientResourceRef1MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientResourceRef1Injection1Class</injection-target-class>
+ <injection-target-name>appClientResourceRef1Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientResourceRef1Injection2Class</injection-target-class>
+ <injection-target-name>appClientResourceRef1Injection2Name</injection-target-name>
+ </injection-target>
+ </resource-ref>
+ <resource-ref id="appClientResourceRef2-id">
+ <description>en-appClientResourceRef2-desc</description>
+ <description xml:lang="fr">fr-appClientResourceRef2-desc</description>
+ <description xml:lang="de">de-appClientResourceRef2-desc</description>
+ <res-ref-name>appClientResourceRef2Name</res-ref-name>
+ <res-type>appClientResourceRef2Type</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Unshareable</res-sharing-scope>
+ <mapped-name>appClientResourceRef2MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientResourceRef2Injection1Class</injection-target-class>
+ <injection-target-name>appClientResourceRef2Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientResourceRef2Injection2Class</injection-target-class>
+ <injection-target-name>appClientResourceRef2Injection2Name</injection-target-name>
+ </injection-target>
+ </resource-ref>
+
+ <!-- resource env ref -->
+ <resource-env-ref id="appClientResourceEnvRef1-id">
+ <description>en-appClientResourceEnvRef1-desc</description>
+ <description xml:lang="fr">fr-appClientResourceEnvRef1-desc</description>
+ <description xml:lang="de">de-appClientResourceEnvRef1-desc</description>
+ <resource-env-ref-name>appClientResourceEnvRef1Name</resource-env-ref-name>
+ <resource-env-ref-type>appClientResourceEnvRef1Type</resource-env-ref-type>
+ <mapped-name>appClientResourceEnvRef1MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientResourceEnvRef1Injection1Class</injection-target-class>
+ <injection-target-name>appClientResourceEnvRef1Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientResourceEnvRef1Injection2Class</injection-target-class>
+ <injection-target-name>appClientResourceEnvRef1Injection2Name</injection-target-name>
+ </injection-target>
+ </resource-env-ref>
+ <resource-env-ref id="appClientResourceEnvRef2-id">
+ <description>en-appClientResourceEnvRef2-desc</description>
+ <description xml:lang="fr">fr-appClientResourceEnvRef2-desc</description>
+ <description xml:lang="de">de-appClientResourceEnvRef2-desc</description>
+ <resource-env-ref-name>appClientResourceEnvRef2Name</resource-env-ref-name>
+ <resource-env-ref-type>appClientResourceEnvRef2Type</resource-env-ref-type>
+ <mapped-name>appClientResourceEnvRef2MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientResourceEnvRef2Injection1Class</injection-target-class>
+ <injection-target-name>appClientResourceEnvRef2Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientResourceEnvRef2Injection2Class</injection-target-class>
+ <injection-target-name>appClientResourceEnvRef2Injection2Name</injection-target-name>
+ </injection-target>
+ </resource-env-ref>
+
+ <!-- message destination ref -->
+ <message-destination-ref id="appClientMessageDestinationRef1-id">
+ <description>en-appClientMessageDestinationRef1-desc</description>
+ <description xml:lang="fr">fr-appClientMessageDestinationRef1-desc</description>
+ <description xml:lang="de">de-appClientMessageDestinationRef1-desc</description>
+ <message-destination-ref-name>appClientMessageDestinationRef1Name</message-destination-ref-name>
+ <message-destination-type>appClientMessageDestinationRef1Type</message-destination-type>
+ <message-destination-usage>Consumes</message-destination-usage>
+ <message-destination-link>appClientMessageDestinationRef1Link</message-destination-link>
+ <mapped-name>appClientMessageDestinationRef1MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientMessageDestinationRef1Injection1Class</injection-target-class>
+ <injection-target-name>appClientMessageDestinationRef1Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientMessageDestinationRef1Injection2Class</injection-target-class>
+ <injection-target-name>appClientMessageDestinationRef1Injection2Name</injection-target-name>
+ </injection-target>
+ </message-destination-ref>
+ <message-destination-ref id="appClientMessageDestinationRef2-id">
+ <description>en-appClientMessageDestinationRef2-desc</description>
+ <description xml:lang="fr">fr-appClientMessageDestinationRef2-desc</description>
+ <description xml:lang="de">de-appClientMessageDestinationRef2-desc</description>
+ <message-destination-ref-name>appClientMessageDestinationRef2Name</message-destination-ref-name>
+ <message-destination-type>appClientMessageDestinationRef2Type</message-destination-type>
+ <message-destination-usage>Produces</message-destination-usage>
+ <message-destination-link>appClientMessageDestinationRef2Link</message-destination-link>
+ <mapped-name>appClientMessageDestinationRef2MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientMessageDestinationRef2Injection1Class</injection-target-class>
+ <injection-target-name>appClientMessageDestinationRef2Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientMessageDestinationRef2Injection2Class</injection-target-class>
+ <injection-target-name>appClientMessageDestinationRef2Injection2Name</injection-target-name>
+ </injection-target>
+ </message-destination-ref>
+ <message-destination-ref id="appClientMessageDestinationRef3-id">
+ <description>en-appClientMessageDestinationRef3-desc</description>
+ <description xml:lang="fr">fr-appClientMessageDestinationRef3-desc</description>
+ <description xml:lang="de">de-appClientMessageDestinationRef3-desc</description>
+ <message-destination-ref-name>appClientMessageDestinationRef3Name</message-destination-ref-name>
+ <message-destination-type>appClientMessageDestinationRef3Type</message-destination-type>
+ <message-destination-usage>ConsumesProduces</message-destination-usage>
+ <message-destination-link>appClientMessageDestinationRef3Link</message-destination-link>
+ <mapped-name>appClientMessageDestinationRef3MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientMessageDestinationRef3Injection1Class</injection-target-class>
+ <injection-target-name>appClientMessageDestinationRef3Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientMessageDestinationRef3Injection2Class</injection-target-class>
+ <injection-target-name>appClientMessageDestinationRef3Injection2Name</injection-target-name>
+ </injection-target>
+ </message-destination-ref>
+
+ <!-- persistence unit ref -->
+ <persistence-unit-ref id="appClientPersistenceUnitRef1-id">
+ <description>en-appClientPersistenceUnitRef1-desc</description>
+ <description xml:lang="fr">fr-appClientPersistenceUnitRef1-desc</description>
+ <description xml:lang="de">de-appClientPersistenceUnitRef1-desc</description>
+ <persistence-unit-ref-name>appClientPersistenceUnitRef1Name</persistence-unit-ref-name>
+ <persistence-unit-name>appClientPersistenceUnitRef1Unit</persistence-unit-name>
+ <mapped-name>appClientPersistenceUnitRef1MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientPersistenceUnitRef1Injection1Class</injection-target-class>
+ <injection-target-name>appClientPersistenceUnitRef1Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientPersistenceUnitRef1Injection2Class</injection-target-class>
+ <injection-target-name>appClientPersistenceUnitRef1Injection2Name</injection-target-name>
+ </injection-target>
+ </persistence-unit-ref>
+ <persistence-unit-ref id="appClientPersistenceUnitRef2-id">
+ <description>en-appClientPersistenceUnitRef2-desc</description>
+ <description xml:lang="fr">fr-appClientPersistenceUnitRef2-desc</description>
+ <description xml:lang="de">de-appClientPersistenceUnitRef2-desc</description>
+ <persistence-unit-ref-name>appClientPersistenceUnitRef2Name</persistence-unit-ref-name>
+ <persistence-unit-name>appClientPersistenceUnitRef2Unit</persistence-unit-name>
+ <mapped-name>appClientPersistenceUnitRef2MappedName</mapped-name>
+ <injection-target>
+ <injection-target-class>appClientPersistenceUnitRef2Injection1Class</injection-target-class>
+ <injection-target-name>appClientPersistenceUnitRef2Injection1Name</injection-target-name>
+ </injection-target>
+ <injection-target>
+ <injection-target-class>appClientPersistenceUnitRef2Injection2Class</injection-target-class>
+ <injection-target-name>appClientPersistenceUnitRef2Injection2Name</injection-target-name>
+ </injection-target>
+ </persistence-unit-ref>
+
+ <!-- post-construct -->
+ <post-construct>
+ <lifecycle-callback-class>appClientPostConstruct1Class</lifecycle-callback-class>
+ <lifecycle-callback-method>appClientPostConstruct1Method</lifecycle-callback-method>
+ </post-construct>
+ <post-construct>
+ <lifecycle-callback-class>appClientPostConstruct2Class</lifecycle-callback-class>
+ <lifecycle-callback-method>appClientPostConstruct2Method</lifecycle-callback-method>
+ </post-construct>
+
+ <!-- pre-destroy -->
+ <pre-destroy>
+ <lifecycle-callback-class>appClientPreDestroy1Class</lifecycle-callback-class>
+ <lifecycle-callback-method>appClientPreDestroy1Method</lifecycle-callback-method>
+ </pre-destroy>
+ <pre-destroy>
+ <lifecycle-callback-class>appClientPreDestroy2Class</lifecycle-callback-class>
+ <lifecycle-callback-method>appClientPreDestroy2Method</lifecycle-callback-method>
+ </pre-destroy>
+
+ <!-- callback handler -->
+ <callback-handler id="appClientCallbackHandler-id">org.jboss.test.metadata.client.AppClientCallbackHandler</callback-handler>
+
+ <!-- message destination -->
+ <message-destination id="appClientMessageDestination1-id">
+ <description>en-appClientMessageDestination1-desc</description>
+ <description xml:lang="fr">fr-appClientMessageDestination1-desc</description>
+ <description xml:lang="de">de-appClientMessageDestination1-desc</description>
+ <display-name>en-appClientMessageDestination1-disp</display-name>
+ <display-name xml:lang="fr">fr-appClientMessageDestination1-disp</display-name>
+ <display-name xml:lang="de">de-appClientMessageDestination1-disp</display-name>
+ <icon id="en-appClientMessageDestination1-icon-id">
+ <small-icon>en-appClientMessageDestination1-small-icon</small-icon>
+ <large-icon>en-appClientMessageDestination1-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-appClientMessageDestination1-icon-id">
+ <small-icon>fr-appClientMessageDestination1-small-icon</small-icon>
+ <large-icon>fr-appClientMessageDestination1-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-appClientMessageDestination1-icon-id">
+ <small-icon>de-appClientMessageDestination1-small-icon</small-icon>
+ <large-icon>de-appClientMessageDestination1-large-icon</large-icon>
+ </icon>
+ <message-destination-name>appClientMessageDestination1Name</message-destination-name>
+ <mapped-name>appClientMessageDestination1MappedName</mapped-name>
+ </message-destination>
+ <message-destination id="appClientMessageDestination2-id">
+ <description>en-appClientMessageDestination2-desc</description>
+ <description xml:lang="fr">fr-appClientMessageDestination2-desc</description>
+ <description xml:lang="de">de-appClientMessageDestination2-desc</description>
+ <display-name>en-appClientMessageDestination2-disp</display-name>
+ <display-name xml:lang="fr">fr-appClientMessageDestination2-disp</display-name>
+ <display-name xml:lang="de">de-appClientMessageDestination2-disp</display-name>
+ <icon id="en-appClientMessageDestination2-icon-id">
+ <small-icon>en-appClientMessageDestination2-small-icon</small-icon>
+ <large-icon>en-appClientMessageDestination2-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-appClientMessageDestination2-icon-id">
+ <small-icon>fr-appClientMessageDestination2-small-icon</small-icon>
+ <large-icon>fr-appClientMessageDestination2-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-appClientMessageDestination2-icon-id">
+ <small-icon>de-appClientMessageDestination2-small-icon</small-icon>
+ <large-icon>de-appClientMessageDestination2-large-icon</large-icon>
+ </icon>
+ <message-destination-name>appClientMessageDestination2Name</message-destination-name>
+ <mapped-name>appClientMessageDestination2MappedName</mapped-name>
+ </message-destination>
+</application-client>
\ No newline at end of file
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/org/jboss/test/metadata/client/JBossClient6Everything_testEverything.xml (from rev 102076, projects/metadata/client/trunk/src/test/resources/org/jboss/test/metadata/client/JBossClient6Everything_testEverything.xml)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/org/jboss/test/metadata/client/JBossClient6Everything_testEverything.xml (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/org/jboss/test/metadata/client/JBossClient6Everything_testEverything.xml 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-client xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.com/xml/ns/javaee/jboss-client_6_0.xsd"
+ version="6.0"
+ id="appclient-test">
+
+ <module-name>jboss-app-client</module-name>
+ <!-- jndi name -->
+ <jndi-name>
+ appClientJndiName
+ </jndi-name>
+
+ <!-- resource ref -->
+ <resource-ref id="appClientResourceRef2-id">
+ <res-ref-name>appClientResourceRef2Name</res-ref-name>
+ <res-url>http://localhost</res-url>
+ </resource-ref>
+
+ <message-destination-ref>
+ <message-destination-ref-name>appClientMessageDestinationRef1Name</message-destination-ref-name>
+ <jndi-name>MDB_QUEUE</jndi-name>
+ </message-destination-ref>
+
+ <!-- depends -->
+ <depends>appClientDepends1</depends>
+ <depends>appClientDepends2</depends>
+</jboss-client>
\ No newline at end of file
Deleted: projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/schema2class.properties
===================================================================
--- projects/metadata/client/trunk/src/test/resources/schema2class.properties 2010-03-05 22:48:26 UTC (rev 102002)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/schema2class.properties 2010-03-08 19:57:46 UTC (rev 102080)
@@ -1,9 +0,0 @@
-# client
-application-client_1_3.dtd org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData
-application-client_1_4.xsd org.jboss.metadata.client.spec.ApplicationClient14MetaData
-application-client_5.xsd org.jboss.metadata.client.spec.ApplicationClient5MetaData
-jboss-client_4_0.dtd org.jboss.metadata.client.jboss.JBossClient5DTDMetaData
-jboss-client_4_2.dtd org.jboss.metadata.client.jboss.JBossClient5DTDMetaData
-jboss-client_5_0.dtd org.jboss.metadata.client.jboss.JBossClient5DTDMetaData
-jboss-client_5_0.xsd org.jboss.metadata.client.jboss.JBossClient5MetaData
-jboss-client org.jboss.metadata.client.jboss.JBossClient5DTDMetaData
Copied: projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/schema2class.properties (from rev 102076, projects/metadata/client/trunk/src/test/resources/schema2class.properties)
===================================================================
--- projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/schema2class.properties (rev 0)
+++ projects/metadata/client/tags/2.0.0.Alpha2/src/test/resources/schema2class.properties 2010-03-08 19:57:46 UTC (rev 102080)
@@ -0,0 +1,11 @@
+# client
+application-client_1_3.dtd org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData
+application-client_1_4.xsd org.jboss.metadata.client.spec.ApplicationClient14MetaData
+application-client_5.xsd org.jboss.metadata.client.spec.ApplicationClient5MetaData
+application-client_6.xsd org.jboss.metadata.client.spec.ApplicationClient6MetaData
+jboss-client_4_0.dtd org.jboss.metadata.client.jboss.JBossClient5DTDMetaData
+jboss-client_4_2.dtd org.jboss.metadata.client.jboss.JBossClient5DTDMetaData
+jboss-client_5_0.dtd org.jboss.metadata.client.jboss.JBossClient5DTDMetaData
+jboss-client_5_0.xsd org.jboss.metadata.client.jboss.JBossClient5MetaData
+jboss-client_6_0.xsd org.jboss.metadata.client.jboss.JBossClient6MetaData
+jboss-client org.jboss.metadata.client.jboss.JBossClient5DTDMetaData
More information about the jboss-cvs-commits
mailing list