Seam SVN: r12923 - modules/international/trunk/docs/reference.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-01 13:45:45 -0400 (Tue, 01 Jun 2010)
New Revision: 12923
Modified:
modules/international/trunk/docs/reference/
Log:
ignores
Property changes on: modules/international/trunk/docs/reference
___________________________________________________________________
Name: svn:ignore
+ .settings
.project
14 years, 8 months
- 1
- 0
Seam SVN: r12922 - modules/faces/trunk/dist.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-01 13:44:30 -0400 (Tue, 01 Jun 2010)
New Revision: 12922
Modified:
modules/faces/trunk/dist/
Log:
ignores
Property changes on: modules/faces/trunk/dist
___________________________________________________________________
Name: svn:ignore
+ .settings
.project
14 years, 8 months
- 1
- 0
Seam SVN: r12921 - in modules/faces/trunk: dist and 3 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-01 13:42:42 -0400 (Tue, 01 Jun 2010)
New Revision: 12921
Added:
modules/faces/trunk/dist/
modules/faces/trunk/dist/distribution.txt
modules/faces/trunk/dist/pom.xml
modules/faces/trunk/dist/src/
modules/faces/trunk/dist/src/main/
modules/faces/trunk/dist/src/main/assembly/
modules/faces/trunk/dist/src/main/assembly/assembly.xml
modules/faces/trunk/dist/src/main/assembly/lgpl.txt
modules/faces/trunk/dist/src/main/assembly/readme.txt
Log:
add dist
Added: modules/faces/trunk/dist/distribution.txt
===================================================================
--- modules/faces/trunk/dist/distribution.txt (rev 0)
+++ modules/faces/trunk/dist/distribution.txt 2010-06-01 17:42:42 UTC (rev 12921)
@@ -0,0 +1,5 @@
+To create the Seam Faces distribution, run the following Maven command:
+
+mvn clean package -Ddist
+
+Release binaries will be produced in: dist/target
Added: modules/faces/trunk/dist/pom.xml
===================================================================
--- modules/faces/trunk/dist/pom.xml (rev 0)
+++ modules/faces/trunk/dist/pom.xml 2010-06-01 17:42:42 UTC (rev 12921)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.seam.faces</groupId>
+ <artifactId>seam-faces-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>seam-faces-distribution</artifactId>
+ <name>Seam Faces Distribution</name>
+ <description>Builds a Seam Faces release distribution</description>
+ <packaging>pom</packaging>
+
+ <!-- TODO Remove -->
+ <!-- Snapshots repo to get parent -->
+ <repositories>
+ <repository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>JBoss (Nexus) Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
+ </url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces-reference-guide</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>seam-faces</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: modules/faces/trunk/dist/src/main/assembly/assembly.xml
===================================================================
--- modules/faces/trunk/dist/src/main/assembly/assembly.xml (rev 0)
+++ modules/faces/trunk/dist/src/main/assembly/assembly.xml 2010-06-01 17:42:42 UTC (rev 12921)
@@ -0,0 +1,70 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <!--<id>distribution</id>-->
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <baseDirectory>${project.build.finalName}-${project.version}</baseDirectory>
+
+ <!-- Add distribution files -->
+ <fileSets>
+ <fileSet>
+ <directory>src/main/assembly</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ <include>lgpl.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <!-- Add necessary binaries -->
+ <dependencySet>
+ <outputDirectory>artifacts</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam.faces:seam-faces-api</include>
+ <include>org.jboss.seam.faces:seam-faces</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ <!-- Add necessary dependencies -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <excludes>
+ <exclude>org.jboss.seam.faces:*</exclude>
+ </excludes>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ <!-- Pull in javadoc for api -->
+ <dependencySet>
+ <outputDirectory>doc/apidocs</outputDirectory>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam.faces:seam-faces-api:jar:javadoc</include>
+ </includes>
+ </dependencySet>
+ <!-- Pull in docbook artifacts -->
+ <dependencySet>
+ <outputDirectory>doc/reference</outputDirectory>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam.faces:seam-faces-reference-guide</include>
+ </includes>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Added: modules/faces/trunk/dist/src/main/assembly/lgpl.txt
===================================================================
--- modules/faces/trunk/dist/src/main/assembly/lgpl.txt (rev 0)
+++ modules/faces/trunk/dist/src/main/assembly/lgpl.txt 2010-06-01 17:42:42 UTC (rev 12921)
@@ -0,0 +1,502 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[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
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library 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 library 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 library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
Added: modules/faces/trunk/dist/src/main/assembly/readme.txt
===================================================================
--- modules/faces/trunk/dist/src/main/assembly/readme.txt (rev 0)
+++ modules/faces/trunk/dist/src/main/assembly/readme.txt 2010-06-01 17:42:42 UTC (rev 12921)
@@ -0,0 +1,50 @@
+
+ Seam Faces Module
+ 3.0.0 SNAPSHOT
+
+ What is it?
+ ===========
+
+ The Seam 3 Faces Module is focused on enhancements for the JavaServer Faces
+ (JSF) web framework, extended integration between JSF and CDI, and integration
+ between JSF and other Seam 3 modules.
+
+ Contents of distribution
+ ========================
+
+ docs/
+
+ API Docs and reference guide.
+
+ examples/
+
+ Seam Faces examples
+
+ ...
+
+ Licensing
+ =========
+
+ This distribution, as a whole, is licensed under the terms of the Apache
+ License, Version 2.0 (see apl.txt).
+
+ Seam Faces URLs
+ ===============
+
+ Seam 3 Faces Module: http://www.sfwk.org/Seam3/FacesModule
+ Seam 3 Home Page: http://www.sfwk.org/Seam3
+ Downloads: http://www.sfwk.org/Seam3/DistributionDownloads
+ Forums: http://www.sfwk.org/Community/Seam3Users
+ Source Code: http://anonsvn.jboss.org/repos/seam/modules/faces
+ Issue Tracking: http://jira.jboss.org/jira/browse/SEAMFACES
+
+ Release Notes
+ =============
+
+ * View actions
+ * javax.faces.bean.*Scoped aliases
+ * @FlashScoped and @ViewScoped
+ * CDI / Faces Phase & System Event bridge
+ * JSF API producers (FacesContext, ExternalContext, NavigationHandler, etc...)
+ * Simplified EL name to conversation: #{conversation.transient}
+
14 years, 8 months
- 1
- 0
Seam SVN: r12920 - in modules/faces/trunk: impl/src/test/java/org/jboss/seam/faces/context and 1 other directories.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-06-01 13:22:35 -0400 (Tue, 01 Jun 2010)
New Revision: 12920
Added:
modules/faces/trunk/api/src/test/java/org/jboss/seam/faces/test/
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/MockFlashContext.java
Modified:
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/status/MessagesAdapterTest.java
Log:
Updated tests.
Added: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/MockFlashContext.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/MockFlashContext.java (rev 0)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/MockFlashContext.java 2010-06-01 17:22:35 UTC (rev 12920)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.seam.faces.context;
+
+import java.io.Serializable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.enterprise.inject.Typed;
+
+/**
+ * A mock {@link FlashContext} that can be injected into tests.
+ *
+ * @author <a href="mailto:lincolnbaxter@gmail.com>Lincoln Baxter, III</a>
+ *
+ */
+(a)Typed(FlashContext.class)
+public class MockFlashContext implements FlashContext, Serializable
+{
+ private static final long serialVersionUID = 7502050909452181348L;
+ private String id = null;
+ private final Map<String, Object> map = new ConcurrentHashMap<String, Object>();
+
+ public Object get(final String key)
+ {
+ return map.get(key);
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setId(final String id)
+ {
+ this.id = id;
+ }
+
+ public boolean isEmpty()
+ {
+ return map.isEmpty();
+ }
+
+ public void put(final String key, final Object value)
+ {
+ map.put(key, value);
+ }
+
+}
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/status/MessagesAdapterTest.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/status/MessagesAdapterTest.java 2010-06-01 17:09:56 UTC (rev 12919)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/status/MessagesAdapterTest.java 2010-06-01 17:22:35 UTC (rev 12920)
@@ -32,10 +32,13 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.faces.MockLogger;
import org.jboss.seam.faces.PhaseTestBase;
+import org.jboss.seam.faces.context.MockFlashContext;
import org.jboss.seam.faces.event.PhaseEventBridge;
import org.jboss.seam.international.status.Bundles;
import org.jboss.seam.international.status.MessageFactory;
import org.jboss.seam.international.status.Messages;
+import org.jboss.seam.international.status.builder.BundleTemplateMessageImpl;
+import org.jboss.seam.international.status.builder.TemplateMessageImpl;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -55,7 +58,7 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessagesAdapter.class, Messages.class, MessageFactory.class, Bundles.class, PhaseEventBridge.class, MockLogger.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessagesAdapter.class, Messages.class, MockFlashContext.class, MessageFactory.class, TemplateMessageImpl.class, BundleTemplateMessageImpl.class, Bundles.class, PhaseEventBridge.class, MockLogger.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
}
@Inject
14 years, 8 months
- 1
- 0
Seam SVN: r12919 - modules/international/trunk/api/src/main/java/org/jboss/seam/international/status.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-06-01 13:09:56 -0400 (Tue, 01 Jun 2010)
New Revision: 12919
Modified:
modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/Messages.java
Log:
A few more comments on the Messages API
Modified: modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/Messages.java
===================================================================
--- modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/Messages.java 2010-06-01 17:04:05 UTC (rev 12918)
+++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/Messages.java 2010-06-01 17:09:56 UTC (rev 12919)
@@ -125,41 +125,74 @@
/*
* Bundle Factory Methods
*/
+
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public BundleTemplateMessage info(final BundleKey message)
{
return enqueueBuilder(factory.info(message));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public BundleTemplateMessage info(final BundleKey message, final Object... params)
{
return enqueueBuilder(factory.info(message, params));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public BundleTemplateMessage warn(final BundleKey message)
{
return enqueueBuilder(factory.warn(message));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public BundleTemplateMessage warn(final BundleKey message, final Object... params)
{
return enqueueBuilder(factory.warn(message, params));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public BundleTemplateMessage error(final BundleKey message)
{
return enqueueBuilder(factory.error(message));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public BundleTemplateMessage error(final BundleKey message, final Object... params)
{
return enqueueBuilder(factory.error(message, params));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public BundleTemplateMessage fatal(final BundleKey message)
{
return enqueueBuilder(factory.fatal(message));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public BundleTemplateMessage fatal(final BundleKey message, final Object... params)
{
return enqueueBuilder(factory.fatal(message, params));
@@ -168,41 +201,74 @@
/*
* Template Factory Methods
*/
+
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public TemplateMessage info(final String message)
{
return enqueueBuilder(factory.info(message));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public TemplateMessage info(final String message, final Object... params)
{
return enqueueBuilder(factory.info(message, params));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public TemplateMessage warn(final String message)
{
return enqueueBuilder(factory.warn(message));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public TemplateMessage warn(final String message, final Object... params)
{
return enqueueBuilder(factory.warn(message, params));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public TemplateMessage error(final String message)
{
return enqueueBuilder(factory.error(message));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public TemplateMessage error(final String message, final Object... params)
{
return enqueueBuilder(factory.error(message, params));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public TemplateMessage fatal(final String message)
{
return enqueueBuilder(factory.fatal(message));
}
+ /**
+ * Create a {@link MessageBuilder} with the specified {@link Level}, add it
+ * to the internal queue, and return it.
+ */
public TemplateMessage fatal(final String message, final Object... params)
{
return enqueueBuilder(factory.fatal(message, params));
14 years, 8 months
- 1
- 0
Seam SVN: r12918 - in modules/international/trunk: api/src/main/java/org/jboss/seam/international/status/builder and 6 other directories.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-06-01 13:04:05 -0400 (Tue, 01 Jun 2010)
New Revision: 12918
Added:
modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/
modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java
modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/Interpolator.java
modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/TemplateMessageImpl.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/TemplateMessageImplTest.java
Removed:
modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/Interpolator.java
modules/international/trunk/api/src/test/java/org/
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/status/
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/TemplateMessageTest.java
Modified:
modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/MessageFactory.java
modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/Messages.java
modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java
modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/TemplateMessage.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java
Log:
Messages API is now fully decoupled from the IMPL.
Modified: modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/MessageFactory.java
===================================================================
--- modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/MessageFactory.java 2010-06-01 09:53:55 UTC (rev 12917)
+++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/MessageFactory.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -23,6 +23,9 @@
import java.io.Serializable;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
import org.jboss.seam.international.status.builder.BundleKey;
@@ -31,7 +34,8 @@
/**
* A utility for building {@link Message} objects via message templates, or
- * message bundles. See {@link TemplateMessage} or {@link BundleTemplateMessage}.
+ * message bundles. See {@link TemplateMessage} or {@link BundleTemplateMessage}
+ * .
*
* @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
*
@@ -41,49 +45,49 @@
private static final long serialVersionUID = -7899463141244189001L;
@Inject
- private Bundles bundles;
+ BeanManager manager;
/*
* Bundle Factory Methods
*/
public BundleTemplateMessage info(final BundleKey message)
{
- return new BundleTemplateMessage(bundles, Level.INFO).text(message);
+ return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.INFO);
}
public BundleTemplateMessage info(final BundleKey message, final Object... params)
{
- return new BundleTemplateMessage(bundles, Level.INFO).text(message).textParams(params);
+ return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.INFO).textParams(params);
}
public BundleTemplateMessage warn(final BundleKey message)
{
- return new BundleTemplateMessage(bundles, Level.WARN).text(message);
+ return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.WARN);
}
public BundleTemplateMessage warn(final BundleKey message, final Object... params)
{
- return new BundleTemplateMessage(bundles, Level.WARN).text(message).textParams(params);
+ return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.WARN).textParams(params);
}
public BundleTemplateMessage error(final BundleKey message)
{
- return new BundleTemplateMessage(bundles, Level.ERROR).text(message);
+ return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.ERROR);
}
public BundleTemplateMessage error(final BundleKey message, final Object... params)
{
- return new BundleTemplateMessage(bundles, Level.ERROR).text(message).textParams(params);
+ return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.ERROR).textParams(params);
}
public BundleTemplateMessage fatal(final BundleKey message)
{
- return new BundleTemplateMessage(bundles, Level.FATAL).text(message);
+ return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.FATAL);
}
public BundleTemplateMessage fatal(final BundleKey message, final Object... params)
{
- return new BundleTemplateMessage(bundles, Level.FATAL).text(message).textParams(params);
+ return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.FATAL).textParams(params);
}
/*
@@ -91,42 +95,68 @@
*/
public TemplateMessage info(final String message)
{
- return new TemplateMessage(Level.INFO).text(message);
+ return getContextualInstance(TemplateMessage.class).text(message).level(Level.INFO);
}
public TemplateMessage info(final String message, final Object... params)
{
- return new TemplateMessage(Level.INFO).text(message).textParams(params);
+ return getContextualInstance(TemplateMessage.class).text(message).level(Level.INFO).textParams(params);
}
public TemplateMessage warn(final String message)
{
- return new TemplateMessage(Level.WARN).text(message);
+ return getContextualInstance(TemplateMessage.class).text(message).level(Level.WARN);
}
public TemplateMessage warn(final String message, final Object... params)
{
- return new TemplateMessage(Level.WARN).text(message).textParams(params);
+ return getContextualInstance(TemplateMessage.class).text(message).level(Level.WARN).textParams(params);
}
public TemplateMessage error(final String message)
{
- return new TemplateMessage(Level.ERROR).text(message);
+ return getContextualInstance(TemplateMessage.class).text(message).level(Level.ERROR);
}
public TemplateMessage error(final String message, final Object... params)
{
- return new TemplateMessage(Level.ERROR).text(message).textParams(params);
+ return getContextualInstance(TemplateMessage.class).text(message).level(Level.ERROR).textParams(params);
}
public TemplateMessage fatal(final String message)
{
- return new TemplateMessage(Level.FATAL).text(message);
+ return getContextualInstance(TemplateMessage.class).text(message).level(Level.FATAL);
}
public TemplateMessage fatal(final String message, final Object... params)
{
- return new TemplateMessage(Level.FATAL).text(message).textParams(params);
+ return getContextualInstance(TemplateMessage.class).text(message).level(Level.FATAL).textParams(params);
}
+ /**
+ * Get a single CDI managed instance of a specific class. Return only the
+ * first result if multiple beans are available.
+ * <p>
+ * <b>NOTE:</b> Using this method should be avoided at all costs.
+ *
+ * @param manager The bean manager with which to perform the lookup.
+ * @param type The class for which to return an instance.
+ * @return The managed instance, or null if none could be provided.
+ */
+ @SuppressWarnings("unchecked")
+ private <T extends MessageBuilder> T getContextualInstance(final Class<T> type)
+ {
+ T result = null;
+ Bean<T> bean = (Bean<T>) manager.resolve(manager.getBeans(type));
+ if (bean != null)
+ {
+ CreationalContext<T> context = manager.createCreationalContext(bean);
+ if (context != null)
+ {
+ result = (T) manager.getReference(bean, type, context);
+ }
+ }
+ return result;
+ }
+
}
Modified: modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/Messages.java
===================================================================
--- modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/Messages.java 2010-06-01 09:53:55 UTC (rev 12917)
+++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/Messages.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -36,7 +36,10 @@
/**
* A convenient way to add messages to be displayed to the user as Feedback,
- * Toast, Alerts, etc...
+ * Toast, Alerts, etc.
+ * <p>
+ * It is the responsibility of the view-layer technology to consume and perform
+ * operations required to display any messages added in this way.
*
* @author <a href="mailto:lincolnbaxter@gmail.com>Lincoln Baxter, III</a>
*
Modified: modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java
===================================================================
--- modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java 2010-06-01 09:53:55 UTC (rev 12917)
+++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -21,7 +21,6 @@
*/
package org.jboss.seam.international.status.builder;
-import org.jboss.seam.international.status.Bundles;
import org.jboss.seam.international.status.Level;
import org.jboss.seam.international.status.Message;
import org.jboss.seam.international.status.MessageBuilder;
@@ -59,121 +58,51 @@
* @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
*
*/
-public class BundleTemplateMessage implements MessageBuilder
+public interface BundleTemplateMessage extends MessageBuilder
{
- private final TemplateMessage template;
- private String textDefault;
- private BundleKey textKey;
+ /**
+ * Set the template for this message, using the given {@link BundleKey} to
+ * perform a resource lookup.
+ * <p>
+ * Any expressions of the form "{0}, {1} ... {N}" found in the template will
+ * be interpolated; numbers reference the index of any given parameters, and
+ * can be used more than once per template.
+ */
+ public BundleTemplateMessage text(final BundleKey text);
- private final Bundles bundles;
+ /**
+ * Set the default template text.
+ * <p>
+ * If the bundle cannot be loaded for any reason, the builder will fall back
+ * to using provided default template text; if there is no default template,
+ * a string representation of the {@link BundleKey} will be used instead.
+ * <p>
+ * Any expressions of the form "{0}, {1} ... {N}" found in the template will
+ * be interpolated; numbers reference the index of any given parameters, and
+ * can be used more than once per template.
+ */
+ public BundleTemplateMessage textDefault(final String text);
- public BundleTemplateMessage(final Bundles bundles, final Level level)
- {
- this.bundles = bundles;
- this.template = new TemplateMessage(level);
- }
+ /**
+ * Set the parameters for this builder's template.
+ * <p>
+ * Parameters may be referenced by index in the template or
+ * {@link #textDefault(String)}, using expressions of the form " {0}, {1} ...
+ * {N}". The same parameters will be used when interpolating default text, in
+ * the case when a {@link BundleKey} cannot be resolved.
+ */
+ public BundleTemplateMessage textParams(final Object... textParams);
/**
- * Produce a {@link Message} object as represented by the current state of
- * <code>this</code> builder.
+ * Set the targets for this message. If supported by the consuming
+ * view-layer, these targets may control where/how the message is displayed
+ * to the user.
*/
- public Message build()
- {
- String text;
- try
- {
- text = bundles.get(textKey.getBundle()).getString(textKey.getKey());
- }
- catch (Exception e)
- {
- text = textDefault;
- }
+ public BundleTemplateMessage targets(final String targets);
- if ((text == null) || "".equals(text))
- {
- text = textKey.toString();
- }
-
- template.text(text);
- return template.build();
- }
-
- /*
- * Setters
+ /**
+ * Set the severity, level of importance of this message.
*/
+ public BundleTemplateMessage level(final Level level);
- public BundleTemplateMessage text(final BundleKey text)
- {
- this.textKey = text;
- return this;
- }
-
- public BundleTemplateMessage textDefault(final String text)
- {
- this.textDefault = text;
- return this;
- }
-
- public BundleTemplateMessage textParams(final Object... textParams)
- {
- this.template.textParams(textParams);
- return this;
- }
-
- public BundleTemplateMessage targets(final String targets)
- {
- this.template.targets(targets);
- return this;
- }
-
- public BundleTemplateMessage setLevel(final Level level)
- {
- this.template.level(level);
- return this;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((template == null) ? 0 : template.hashCode());
- result = prime * result + ((textDefault == null) ? 0 : textDefault.hashCode());
- result = prime * result + ((textKey == null) ? 0 : textKey.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- BundleTemplateMessage other = (BundleTemplateMessage) obj;
- if (template == null)
- {
- if (other.template != null)
- return false;
- }
- else if (!template.equals(other.template))
- return false;
- if (textDefault == null)
- {
- if (other.textDefault != null)
- return false;
- }
- else if (!textDefault.equals(other.textDefault))
- return false;
- if (textKey == null)
- {
- if (other.textKey != null)
- return false;
- }
- else if (!textKey.equals(other.textKey))
- return false;
- return true;
- }
-}
+}
\ No newline at end of file
Deleted: modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/Interpolator.java
===================================================================
--- modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/Interpolator.java 2010-06-01 09:53:55 UTC (rev 12917)
+++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/Interpolator.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.seam.international.status.builder;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Populates an interpolated string using the given template and parameters:
- * <p>
- * <b>For example:</b><br>
- * Template:
- * <code>"This is a {0} template with {1} parameters. Just {1}."</code><br>
- * Parameters: <code>"simple", 2</code><br>
- * Result: <code>"This is a simple template with 2 parameters. Just 2"</code>
- *
- *
- * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
- *
- */
-class Interpolator
-{
- private static final String templateRegex = "\\{(\\d+)\\}";
- private static final Pattern templatePattern = Pattern.compile(templateRegex);
-
- /**
- * Populate a template with the corresponding parameters.
- */
- public String populate(final String template, final Object... params)
- {
- StringBuffer result = new StringBuffer();
- if ((template != null) && (params != null))
- {
- Matcher matcher = templatePattern.matcher(template);
- while (matcher.find())
- {
- int index = Integer.valueOf(matcher.group(1));
- Object value = matcher.group();
-
- if (params.length > index)
- {
- if (params[index] != null)
- {
- value = params[index];
- }
- }
- matcher.appendReplacement(result, value.toString());
- }
- matcher.appendTail(result);
- }
- else if (template != null)
- {
- result = new StringBuffer(template);
- }
- return result.toString();
- }
-}
Modified: modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/TemplateMessage.java
===================================================================
--- modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/TemplateMessage.java 2010-06-01 09:53:55 UTC (rev 12917)
+++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/TemplateMessage.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -21,16 +21,13 @@
*/
package org.jboss.seam.international.status.builder;
-import java.util.Arrays;
-
import org.jboss.seam.international.status.Level;
import org.jboss.seam.international.status.Message;
import org.jboss.seam.international.status.MessageBuilder;
-import org.jboss.seam.international.status.MutableMessage;
/**
- * This {@link MessageBuilder} implementation creates {@link Message} objects by
- * interpolating templates with values supplied as parameters.
+ * This {@link MessageBuilder} creates {@link Message} objects by interpolating
+ * templates with values supplied as parameters.
* <p>
* <b>For example:</b> Given the following {@link Message} m
*
@@ -45,139 +42,35 @@
* @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
*
*/
-public class TemplateMessage implements MessageBuilder
+public interface TemplateMessage extends MessageBuilder
{
- private static final String MESSAGE_IMPL_CLASS = "org.jboss.seam.international.status.MessageImpl";
+ /**
+ * Set the template for this message.
+ * <p>
+ * Any expressions of the form "{0}, {1} ... {N}" found in the template will
+ * be interpolated; numbers reference the index of any given parameters, and
+ * can be used more than once per template.
+ */
+ public TemplateMessage text(final String summary);
- private final Interpolator interpolator = new Interpolator();
+ /**
+ * Set the parameters for this builder's template.
+ * <p>
+ * Parameters may be referenced by index in the template, using expressions
+ * of the form "{0}, {1} ... {N}"
+ */
+ public TemplateMessage textParams(final Object... summaryParams);
- private String summary;
- private Object[] summaryParams;
-
- private String targets;
- private Level level;
-
- public TemplateMessage(final Level level)
- {
- this.level = level;
- }
-
/**
- * Produce a {@link Message} object as represented by the current state of
- * <code>this</code> builder.
+ * Set the targets for this message. If supported by the consuming
+ * view-layer, these targets may control where/how the message is displayed
+ * to the user.
*/
- public Message build()
- {
- Class<?> type;
- try
- {
- type = Class.forName(MESSAGE_IMPL_CLASS);
- MutableMessage message = (MutableMessage) type.newInstance();
+ public TemplateMessage targets(final String targets);
- message.setLevel(level);
- message.setText(interpolator.populate(summary, summaryParams));
- message.setTargets(targets);
-
- return message;
- }
- catch (Exception e)
- {
- throw new RuntimeException("Unable to create message: " + MESSAGE_IMPL_CLASS, e);
- }
- }
-
- /*
- * Setters
+ /**
+ * Set the severity, level of importance of this message.
*/
- public TemplateMessage text(final String summary)
- {
- this.summary = summary;
- return this;
- }
+ public TemplateMessage level(final Level level);
- public TemplateMessage textParams(final Object... summaryParams)
- {
- this.summaryParams = summaryParams;
- return this;
- }
-
- public TemplateMessage targets(final String targets)
- {
- this.targets = targets;
- return this;
- }
-
- public TemplateMessage level(final Level level)
- {
- this.level = level;
- return this;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((level == null) ? 0 : level.hashCode());
- result = prime * result + ((summary == null) ? 0 : summary.hashCode());
- result = prime * result + Arrays.hashCode(summaryParams);
- result = prime * result + ((targets == null) ? 0 : targets.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(final Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- TemplateMessage other = (TemplateMessage) obj;
- if (level == null)
- {
- if (other.level != null)
- {
- return false;
- }
- }
- else if (!level.equals(other.level))
- {
- return false;
- }
- if (summary == null)
- {
- if (other.summary != null)
- {
- return false;
- }
- }
- else if (!summary.equals(other.summary))
- {
- return false;
- }
- if (!Arrays.equals(summaryParams, other.summaryParams))
- {
- return false;
- }
- if (targets == null)
- {
- if (other.targets != null)
- {
- return false;
- }
- }
- else if (!targets.equals(other.targets))
- {
- return false;
- }
- return true;
- }
-}
+}
\ No newline at end of file
Copied: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java (from rev 12917, modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java)
===================================================================
--- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java (rev 0)
+++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -0,0 +1,163 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.seam.international.status.builder;
+
+import javax.inject.Inject;
+
+import org.jboss.seam.international.status.Bundles;
+import org.jboss.seam.international.status.Level;
+import org.jboss.seam.international.status.Message;
+
+/**
+ *
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ *
+ */
+public class BundleTemplateMessageImpl implements BundleTemplateMessage
+{
+ @Inject
+ TemplateMessage template;
+
+ private String textDefault;
+ private BundleKey textKey;
+
+ @Inject
+ Bundles bundles;
+
+ public Message build()
+ {
+ String text;
+ try
+ {
+ text = bundles.get(textKey.getBundle()).getString(textKey.getKey());
+ }
+ catch (Exception e)
+ {
+ text = textDefault;
+ }
+
+ if ((text == null) || "".equals(text))
+ {
+ text = textKey.toString();
+ }
+
+ template.text(text);
+ return template.build();
+ }
+
+ /*
+ * Setters
+ */
+
+ public BundleTemplateMessageImpl text(final BundleKey text)
+ {
+ this.textKey = text;
+ return this;
+ }
+
+ public BundleTemplateMessage textDefault(final String text)
+ {
+ this.textDefault = text;
+ return this;
+ }
+
+ public BundleTemplateMessageImpl textParams(final Object... textParams)
+ {
+ this.template.textParams(textParams);
+ return this;
+ }
+
+ public BundleTemplateMessage targets(final String targets)
+ {
+ this.template.targets(targets);
+ return this;
+ }
+
+ public BundleTemplateMessage level(final Level level)
+ {
+ this.template.level(level);
+ return this;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((template == null) ? 0 : template.hashCode());
+ result = prime * result + ((textDefault == null) ? 0 : textDefault.hashCode());
+ result = prime * result + ((textKey == null) ? 0 : textKey.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj)
+ {
+ if (this == obj)
+ {
+ return true;
+ }
+ if (obj == null)
+ {
+ return false;
+ }
+ if (getClass() != obj.getClass())
+ {
+ return false;
+ }
+ BundleTemplateMessageImpl other = (BundleTemplateMessageImpl) obj;
+ if (template == null)
+ {
+ if (other.template != null)
+ {
+ return false;
+ }
+ }
+ else if (!template.equals(other.template))
+ {
+ return false;
+ }
+ if (textDefault == null)
+ {
+ if (other.textDefault != null)
+ {
+ return false;
+ }
+ }
+ else if (!textDefault.equals(other.textDefault))
+ {
+ return false;
+ }
+ if (textKey == null)
+ {
+ if (other.textKey != null)
+ {
+ return false;
+ }
+ }
+ else if (!textKey.equals(other.textKey))
+ {
+ return false;
+ }
+ return true;
+ }
+}
Copied: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/Interpolator.java (from rev 12917, modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/Interpolator.java)
===================================================================
--- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/Interpolator.java (rev 0)
+++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/Interpolator.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.seam.international.status.builder;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Populates an interpolated string using the given template and parameters:
+ * <p>
+ * <b>For example:</b><br>
+ * Template:
+ * <code>"This is a {0} template with {1} parameters. Just {1}."</code><br>
+ * Parameters: <code>"simple", 2</code><br>
+ * Result: <code>"This is a simple template with 2 parameters. Just 2"</code>
+ *
+ *
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ *
+ */
+class Interpolator
+{
+ private static final String templateRegex = "\\{(\\d+)\\}";
+ private static final Pattern templatePattern = Pattern.compile(templateRegex);
+
+ /**
+ * Populate a template with the corresponding parameters.
+ */
+ public String populate(final String template, final Object... params)
+ {
+ StringBuffer result = new StringBuffer();
+ if ((template != null) && (params != null))
+ {
+ Matcher matcher = templatePattern.matcher(template);
+ while (matcher.find())
+ {
+ int index = Integer.valueOf(matcher.group(1));
+ Object value = matcher.group();
+
+ if (params.length > index)
+ {
+ if (params[index] != null)
+ {
+ value = params[index];
+ }
+ }
+ matcher.appendReplacement(result, value.toString());
+ }
+ matcher.appendTail(result);
+ }
+ else if (template != null)
+ {
+ result = new StringBuffer(template);
+ }
+ return result.toString();
+ }
+}
Copied: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/TemplateMessageImpl.java (from rev 12917, modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/TemplateMessage.java)
===================================================================
--- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/TemplateMessageImpl.java (rev 0)
+++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/TemplateMessageImpl.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -0,0 +1,149 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.seam.international.status.builder;
+
+import java.util.Arrays;
+
+import org.jboss.seam.international.status.Level;
+import org.jboss.seam.international.status.Message;
+import org.jboss.seam.international.status.MessageBuilder;
+import org.jboss.seam.international.status.MessageImpl;
+import org.jboss.seam.international.status.MutableMessage;
+
+/**
+ *
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ *
+ */
+public class TemplateMessageImpl implements MessageBuilder, TemplateMessage
+{
+ private final Interpolator interpolator = new Interpolator();
+
+ private String summary;
+ private Object[] summaryParams;
+
+ private String targets;
+ private Level level;
+
+ public Message build()
+ {
+ MutableMessage message = new MessageImpl();
+
+ message.setLevel(level);
+ message.setText(interpolator.populate(summary, summaryParams));
+ message.setTargets(targets);
+
+ return message;
+ }
+
+ public TemplateMessageImpl text(final String summary)
+ {
+ this.summary = summary;
+ return this;
+ }
+
+ public TemplateMessageImpl textParams(final Object... summaryParams)
+ {
+ this.summaryParams = summaryParams;
+ return this;
+ }
+
+ public TemplateMessage targets(final String targets)
+ {
+ this.targets = targets;
+ return this;
+ }
+
+ public TemplateMessage level(final Level level)
+ {
+ this.level = level;
+ return this;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((level == null) ? 0 : level.hashCode());
+ result = prime * result + ((summary == null) ? 0 : summary.hashCode());
+ result = prime * result + Arrays.hashCode(summaryParams);
+ result = prime * result + ((targets == null) ? 0 : targets.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj)
+ {
+ if (this == obj)
+ {
+ return true;
+ }
+ if (obj == null)
+ {
+ return false;
+ }
+ if (getClass() != obj.getClass())
+ {
+ return false;
+ }
+ TemplateMessageImpl other = (TemplateMessageImpl) obj;
+ if (level == null)
+ {
+ if (other.level != null)
+ {
+ return false;
+ }
+ }
+ else if (!level.equals(other.level))
+ {
+ return false;
+ }
+ if (summary == null)
+ {
+ if (other.summary != null)
+ {
+ return false;
+ }
+ }
+ else if (!summary.equals(other.summary))
+ {
+ return false;
+ }
+ if (!Arrays.equals(summaryParams, other.summaryParams))
+ {
+ return false;
+ }
+ if (targets == null)
+ {
+ if (other.targets != null)
+ {
+ return false;
+ }
+ }
+ else if (!targets.equals(other.targets))
+ {
+ return false;
+ }
+ return true;
+ }
+}
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java 2010-06-01 09:53:55 UTC (rev 12917)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -34,6 +34,8 @@
import org.jboss.seam.international.status.Messages;
import org.jboss.seam.international.status.MutableMessage;
import org.jboss.seam.international.status.builder.BundleKey;
+import org.jboss.seam.international.status.builder.BundleTemplateMessageImpl;
+import org.jboss.seam.international.status.builder.TemplateMessageImpl;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -54,7 +56,7 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(Messages.class, MessageFactory.class, Bundles.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(Messages.class, MessageFactory.class, BundleTemplateMessageImpl.class, TemplateMessageImpl.class, Bundles.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
}
@Inject
Copied: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java (from rev 12917, modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageTest.java)
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java (rev 0)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.seam.international.test.status.builder;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.international.status.Bundles;
+import org.jboss.seam.international.status.MessageFactory;
+import org.jboss.seam.international.status.builder.BundleTemplateMessageImpl;
+import org.jboss.seam.international.status.builder.TemplateMessage;
+import org.jboss.seam.international.status.builder.TemplateMessageImpl;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ *
+ */
+(a)RunWith(Arquillian.class)
+public class BundleTemplateMessageImplTest
+{
+ @Deployment
+ public static Archive<?> createTestArchive()
+ {
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessageFactory.class, BundleTemplateMessageImpl.class, TemplateMessageImpl.class, Bundles.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ }
+
+ @Inject
+ MessageFactory factory;
+
+ @Test
+ public void testParameterizedTemplate() throws Exception
+ {
+ String expected = "There are 5 cars, and they are all green; green is the best color.";
+ TemplateMessage builder = factory.info("There are {0} cars, and they are all {1}; {1} is the best color.", 5, "green");
+ assertEquals(expected, builder.build().getText());
+ }
+
+ @Test
+ public void testParameterizedTemplateInsertsParamNumbersIfNotEnoughParamValues() throws Exception
+ {
+ String expected = "There are 5 cars, and they are all {1}; {1} is the best color.";
+ TemplateMessage builder = factory.warn("There are {0} cars, and they are all {1}; {1} is the best color.", 5);
+ assertEquals(expected, builder.build().getText());
+ }
+
+ @Test
+ public void testPlainTextTemplate() throws Exception
+ {
+ String expected = "There are 5 cars, and they are all green; green is the best color.";
+ TemplateMessage builder = factory.error("There are 5 cars, and they are all green; green is the best color.");
+ assertEquals(expected, builder.build().getText());
+ }
+
+ @Test
+ public void testPlainTextTemplateWithParamsIsUnmodified() throws Exception
+ {
+ String expected = "There are 5 cars, and they are all green; green is the best color.";
+ TemplateMessage builder = factory.fatal("There are 5 cars, and they are all green; green is the best color.", "blue", "red", 6);
+ assertEquals(expected, builder.build().getText());
+ }
+}
Deleted: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageTest.java 2010-06-01 09:53:55 UTC (rev 12917)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageTest.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.seam.international.test.status.builder;
-
-import static org.junit.Assert.assertEquals;
-
-import javax.inject.Inject;
-
-import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.seam.international.status.Bundles;
-import org.jboss.seam.international.status.MessageFactory;
-import org.jboss.seam.international.status.builder.TemplateMessage;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
- *
- */
-(a)RunWith(Arquillian.class)
-public class BundleTemplateMessageTest
-{
- @Deployment
- public static Archive<?> createTestArchive()
- {
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessageFactory.class, Bundles.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
- }
-
- @Inject
- MessageFactory factory;
-
- @Test
- public void testParameterizedTemplate() throws Exception
- {
- String expected = "There are 5 cars, and they are all green; green is the best color.";
- TemplateMessage builder = factory.info("There are {0} cars, and they are all {1}; {1} is the best color.", 5, "green");
- assertEquals(expected, builder.build().getText());
- }
-
- @Test
- public void testParameterizedTemplateInsertsParamNumbersIfNotEnoughParamValues() throws Exception
- {
- String expected = "There are 5 cars, and they are all {1}; {1} is the best color.";
- TemplateMessage builder = factory.warn("There are {0} cars, and they are all {1}; {1} is the best color.", 5);
- assertEquals(expected, builder.build().getText());
- }
-
- @Test
- public void testPlainTextTemplate() throws Exception
- {
- String expected = "There are 5 cars, and they are all green; green is the best color.";
- TemplateMessage builder = factory.error("There are 5 cars, and they are all green; green is the best color.");
- assertEquals(expected, builder.build().getText());
- }
-
- @Test
- public void testPlainTextTemplateWithParamsIsUnmodified() throws Exception
- {
- String expected = "There are 5 cars, and they are all green; green is the best color.";
- TemplateMessage builder = factory.fatal("There are 5 cars, and they are all green; green is the best color.", "blue", "red", 6);
- assertEquals(expected, builder.build().getText());
- }
-}
Copied: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/TemplateMessageImplTest.java (from rev 12917, modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/TemplateMessageTest.java)
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/TemplateMessageImplTest.java (rev 0)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/TemplateMessageImplTest.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.seam.international.test.status.builder;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.international.status.MessageFactory;
+import org.jboss.seam.international.status.builder.TemplateMessage;
+import org.jboss.seam.international.status.builder.TemplateMessageImpl;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ *
+ */
+(a)RunWith(Arquillian.class)
+public class TemplateMessageImplTest
+{
+ @Deployment
+ public static Archive<?> createTestArchive()
+ {
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessageFactory.class, TemplateMessageImpl.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ }
+
+ @Inject
+ MessageFactory factory;
+
+ @Test
+ public void testParameterizedTemplate() throws Exception
+ {
+ String expected = "There are 5 cars, and they are all green; green is the best color.";
+ TemplateMessage builder = factory.info("There are {0} cars, and they are all {1}; {1} is the best color.", 5, "green");
+ assertEquals(expected, builder.build().getText());
+ }
+
+ @Test
+ public void testParameterizedTemplateInsertsParamNumbersIfNotEnoughParamValues() throws Exception
+ {
+ String expected = "There are 5 cars, and they are all {1}; {1} is the best color.";
+ TemplateMessage builder = factory.warn("There are {0} cars, and they are all {1}; {1} is the best color.", 5);
+ assertEquals(expected, builder.build().getText());
+ }
+
+ @Test
+ public void testPlainTextTemplate() throws Exception
+ {
+ String expected = "There are 5 cars, and they are all green; green is the best color.";
+ TemplateMessage builder = factory.error("There are 5 cars, and they are all green; green is the best color.");
+ assertEquals(expected, builder.build().getText());
+ }
+
+ @Test
+ public void testPlainTextTemplateWithParamsIsUnmodified() throws Exception
+ {
+ String expected = "There are 5 cars, and they are all green; green is the best color.";
+ TemplateMessage builder = factory.fatal("There are 5 cars, and they are all green; green is the best color.", "blue", "red", 6);
+ assertEquals(expected, builder.build().getText());
+ }
+}
Deleted: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/TemplateMessageTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/TemplateMessageTest.java 2010-06-01 09:53:55 UTC (rev 12917)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/TemplateMessageTest.java 2010-06-01 17:04:05 UTC (rev 12918)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.seam.international.test.status.builder;
-
-import static org.junit.Assert.assertEquals;
-
-import javax.inject.Inject;
-
-import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.seam.international.status.Bundles;
-import org.jboss.seam.international.status.MessageFactory;
-import org.jboss.seam.international.status.builder.TemplateMessage;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
- *
- */
-(a)RunWith(Arquillian.class)
-public class TemplateMessageTest
-{
- @Deployment
- public static Archive<?> createTestArchive()
- {
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessageFactory.class, Bundles.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
- }
-
- @Inject
- MessageFactory factory;
-
- @Test
- public void testParameterizedTemplate() throws Exception
- {
- String expected = "There are 5 cars, and they are all green; green is the best color.";
- TemplateMessage builder = factory.info("There are {0} cars, and they are all {1}; {1} is the best color.", 5, "green");
- assertEquals(expected, builder.build().getText());
- }
-
- @Test
- public void testParameterizedTemplateInsertsParamNumbersIfNotEnoughParamValues() throws Exception
- {
- String expected = "There are 5 cars, and they are all {1}; {1} is the best color.";
- TemplateMessage builder = factory.warn("There are {0} cars, and they are all {1}; {1} is the best color.", 5);
- assertEquals(expected, builder.build().getText());
- }
-
- @Test
- public void testPlainTextTemplate() throws Exception
- {
- String expected = "There are 5 cars, and they are all green; green is the best color.";
- TemplateMessage builder = factory.error("There are 5 cars, and they are all green; green is the best color.");
- assertEquals(expected, builder.build().getText());
- }
-
- @Test
- public void testPlainTextTemplateWithParamsIsUnmodified() throws Exception
- {
- String expected = "There are 5 cars, and they are all green; green is the best color.";
- TemplateMessage builder = factory.fatal("There are 5 cars, and they are all green; green is the best color.", "blue", "red", 6);
- assertEquals(expected, builder.build().getText());
- }
-}
14 years, 8 months
- 1
- 0
Seam SVN: r12916 - modules/security/trunk/docs/en-US/images.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-06-01 05:48:50 -0400 (Tue, 01 Jun 2010)
New Revision: 12916
Added:
modules/security/trunk/docs/en-US/images/jpa_db_model_config10.png
modules/security/trunk/docs/en-US/images/jpa_db_model_config9.png
Log:
more documentation diagrams
Added: modules/security/trunk/docs/en-US/images/jpa_db_model_config10.png
===================================================================
(Binary files differ)
Property changes on: modules/security/trunk/docs/en-US/images/jpa_db_model_config10.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/security/trunk/docs/en-US/images/jpa_db_model_config9.png
===================================================================
(Binary files differ)
Property changes on: modules/security/trunk/docs/en-US/images/jpa_db_model_config9.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 8 months
- 1
- 0
Seam SVN: r12915 - modules/security/trunk/docs/en-US/images.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-06-01 05:23:38 -0400 (Tue, 01 Jun 2010)
New Revision: 12915
Added:
modules/security/trunk/docs/en-US/images/jpa_db_model_config1.png
modules/security/trunk/docs/en-US/images/jpa_db_model_config2.png
modules/security/trunk/docs/en-US/images/jpa_db_model_config3.png
modules/security/trunk/docs/en-US/images/jpa_db_model_config4.png
modules/security/trunk/docs/en-US/images/jpa_db_model_config5.png
modules/security/trunk/docs/en-US/images/jpa_db_model_config6.png
modules/security/trunk/docs/en-US/images/jpa_db_model_config7.png
modules/security/trunk/docs/en-US/images/jpa_db_model_config8.png
modules/security/trunk/docs/en-US/images/jpa_db_model_full.png
Log:
add model diagrams for documentation
Added: modules/security/trunk/docs/en-US/images/jpa_db_model_config1.png
===================================================================
(Binary files differ)
Property changes on: modules/security/trunk/docs/en-US/images/jpa_db_model_config1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/security/trunk/docs/en-US/images/jpa_db_model_config2.png
===================================================================
(Binary files differ)
Property changes on: modules/security/trunk/docs/en-US/images/jpa_db_model_config2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/security/trunk/docs/en-US/images/jpa_db_model_config3.png
===================================================================
(Binary files differ)
Property changes on: modules/security/trunk/docs/en-US/images/jpa_db_model_config3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/security/trunk/docs/en-US/images/jpa_db_model_config4.png
===================================================================
(Binary files differ)
Property changes on: modules/security/trunk/docs/en-US/images/jpa_db_model_config4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/security/trunk/docs/en-US/images/jpa_db_model_config5.png
===================================================================
(Binary files differ)
Property changes on: modules/security/trunk/docs/en-US/images/jpa_db_model_config5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/security/trunk/docs/en-US/images/jpa_db_model_config6.png
===================================================================
(Binary files differ)
Property changes on: modules/security/trunk/docs/en-US/images/jpa_db_model_config6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/security/trunk/docs/en-US/images/jpa_db_model_config7.png
===================================================================
(Binary files differ)
Property changes on: modules/security/trunk/docs/en-US/images/jpa_db_model_config7.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/security/trunk/docs/en-US/images/jpa_db_model_config8.png
===================================================================
(Binary files differ)
Property changes on: modules/security/trunk/docs/en-US/images/jpa_db_model_config8.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/security/trunk/docs/en-US/images/jpa_db_model_full.png
===================================================================
(Binary files differ)
Property changes on: modules/security/trunk/docs/en-US/images/jpa_db_model_full.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 8 months
- 1
- 0