Seam SVN: r12082 - in modules/remoting/trunk/dist: src and 1 other directories.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-02-28 17:52:41 -0500 (Sun, 28 Feb 2010)
New Revision: 12082
Added:
modules/remoting/trunk/dist/src/
modules/remoting/trunk/dist/src/assemble/
modules/remoting/trunk/dist/src/assemble/bin.xml
Modified:
modules/remoting/trunk/dist/pom.xml
Log:
some more progress with assembly plugin
Modified: modules/remoting/trunk/dist/pom.xml
===================================================================
--- modules/remoting/trunk/dist/pom.xml 2010-02-26 14:49:35 UTC (rev 12081)
+++ modules/remoting/trunk/dist/pom.xml 2010-02-28 22:52:41 UTC (rev 12082)
@@ -11,14 +11,14 @@
</parent>
<groupId>org.jboss.seam.remoting</groupId>
- <artifactId>seam-remoting-parent</artifactId>
+ <artifactId>seam-remoting-dist</artifactId>
<packaging>pom</packaging>
<version>3.0-SNAPSHOT</version>
<name>Seam Remoting Parent</name>
<modules>
- <module>seam-remoting-core</module>
- <module>seam-remoting-docs</module>
+ <module>../core</module>
+ <module>../docs</module>
</modules>
<!-- Snapshots repo to get parent -->
@@ -43,9 +43,9 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
<configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
</configuration>
</plugin>
</plugins>
Added: modules/remoting/trunk/dist/src/assemble/bin.xml
===================================================================
--- modules/remoting/trunk/dist/src/assemble/bin.xml (rev 0)
+++ modules/remoting/trunk/dist/src/assemble/bin.xml 2010-02-28 22:52:41 UTC (rev 12082)
@@ -0,0 +1,20 @@
+<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>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.seam.remoting:seam-remoting-core</include>
+ </includes>
+ <binaries>
+ <outputDirectory>modules/${artifactId}</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
14 years, 9 months
Seam SVN: r12081 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-02-26 09:49:35 -0500 (Fri, 26 Feb 2010)
New Revision: 12081
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async/AbstractDispatcher.java
Log:
JBPAPP-3188 - workaround for IBM javac bug
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async/AbstractDispatcher.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async/AbstractDispatcher.java 2010-02-26 05:25:15 UTC (rev 12080)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async/AbstractDispatcher.java 2010-02-26 14:49:35 UTC (rev 12081)
@@ -151,7 +151,7 @@
}
else if ( annotation.annotationType().equals(FinalExpiration.class) )
{
- if (!( this instanceof QuartzDispatcher ))
+ if (!( QuartzDispatcher.class.isInstance(this) ))
{
throw new IllegalArgumentException("Can only use @FinalExpiration with the QuartzDispatcher");
}
@@ -166,7 +166,7 @@
}
else if ( annotation.annotationType().equals(IntervalCron.class) )
{
- if (!( this instanceof QuartzDispatcher ))
+ if (!( QuartzDispatcher.class.isInstance(this) ))
{
throw new IllegalArgumentException("Can only use @IntervalCron with the QuartzDispatcher");
}
14 years, 9 months
Seam SVN: r12079 - in modules/remoting/trunk: core and 1 other directories.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-02-26 00:24:23 -0500 (Fri, 26 Feb 2010)
New Revision: 12079
Added:
modules/remoting/trunk/core/
modules/remoting/trunk/core/pom.xml
modules/remoting/trunk/core/src/
modules/remoting/trunk/lgpl.txt
Removed:
modules/remoting/trunk/pom.xml
modules/remoting/trunk/src/
Modified:
modules/remoting/trunk/docs/README.TXT
modules/remoting/trunk/docs/pom.xml
modules/remoting/trunk/readme.txt
Log:
moved remoting-core to core dir
Copied: modules/remoting/trunk/core/pom.xml (from rev 12070, modules/remoting/trunk/pom.xml)
===================================================================
--- modules/remoting/trunk/core/pom.xml (rev 0)
+++ modules/remoting/trunk/core/pom.xml 2010-02-26 05:24:23 UTC (rev 12079)
@@ -0,0 +1,108 @@
+<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>
+ <artifactId>seam-parent</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.jboss.seam.remoting</groupId>
+ <artifactId>seam-remoting-core</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Seam Remoting</name>
+
+ <!-- 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>
+ <seam.version>3.0.0-SNAPSHOT</seam.version>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- non portable dependency -->
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Seam/modules/remoting/trunk</url>
+ </scm>
+
+</project>
Copied: modules/remoting/trunk/core/src (from rev 12070, modules/remoting/trunk/src)
Modified: modules/remoting/trunk/docs/README.TXT
===================================================================
--- modules/remoting/trunk/docs/README.TXT 2010-02-26 05:01:05 UTC (rev 12078)
+++ modules/remoting/trunk/docs/README.TXT 2010-02-26 05:24:23 UTC (rev 12079)
@@ -1,3 +1,3 @@
To build the Seam Remoting docs run the following command:
-mvn jdocbook:generate
+mvn clean install
Modified: modules/remoting/trunk/docs/pom.xml
===================================================================
--- modules/remoting/trunk/docs/pom.xml 2010-02-26 05:01:05 UTC (rev 12078)
+++ modules/remoting/trunk/docs/pom.xml 2010-02-26 05:24:23 UTC (rev 12079)
@@ -3,9 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>8</version>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.seam.remoting</groupId>
Added: modules/remoting/trunk/lgpl.txt
===================================================================
--- modules/remoting/trunk/lgpl.txt (rev 0)
+++ modules/remoting/trunk/lgpl.txt 2010-02-26 05:24:23 UTC (rev 12079)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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!
+
+
Deleted: modules/remoting/trunk/pom.xml
===================================================================
--- modules/remoting/trunk/pom.xml 2010-02-26 05:01:05 UTC (rev 12078)
+++ modules/remoting/trunk/pom.xml 2010-02-26 05:24:23 UTC (rev 12079)
@@ -1,108 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>seam-parent</artifactId>
- <groupId>org.jboss.seam</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.jboss.seam.remoting</groupId>
- <artifactId>seam-remoting-core</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Seam Remoting</name>
-
- <!-- 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>
- <seam.version>3.0.0-SNAPSHOT</seam.version>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- non portable dependency -->
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/Seam/modules/remoting/trunk</url>
- </scm>
-
-</project>
Modified: modules/remoting/trunk/readme.txt
===================================================================
--- modules/remoting/trunk/readme.txt 2010-02-26 05:01:05 UTC (rev 12078)
+++ modules/remoting/trunk/readme.txt 2010-02-26 05:24:23 UTC (rev 12079)
@@ -1,4 +1,46 @@
-Seam Remoting
+Seam Remoting 3.0.0 Beta 1
+==========================
+
+Seam Remoting is an AJAX remoting API for CDI-based applications.
+
+
+Contents of distribution
+========================
+
+doc/
+
+ API Docs and reference guide.
+
+examples/
+
+ Seam Remoting Examples
+
+artifacts/
+
+ Seam Remoting jar files
+
+Licensing
+=========
+
+This distribution, as a whole, is licensed under the terms of the GNU Lesser General Public License
+(LGPL) Version 2.1, the text of which is contained in the file lgpl.txt.
+
+Seam Remoting URLs
+==================
+
+Seam Framework Home Page: http://www.seamframework.org
+Downloads: http://www.seamframework.org/Download/SeamDownloads
+Forums: http://www.seamframework.org/Community/SeamUsers
+Source Code: http://anonsvn.jboss.org/repos/seam/modules/remoting/
+Issue Tracking: http://jira.jboss.org/jira/browse/JBSEAM
+
+Release Notes
=============
-Seam Remoting is an AJAX remoting API for CDI-based applications.
+Version 3.0.0 Beta 1
+--------------------
+First beta release of Seam Remoting 3.x, ported from Seam 2.x to CDI.
+
+* Added new feature - Model API
+* Simplified JavaScript stubs for server-side beans
+* Added option to compress remote.js - add ?compress=true to URL
14 years, 9 months
Seam SVN: r12078 - in modules/xml/trunk: src/main/java/org/jboss/seam/xml/parser/namespace and 2 other directories.
by seam-commits@lists.jboss.org
Author: swd847
Date: 2010-02-26 00:01:05 -0500 (Fri, 26 Feb 2010)
New Revision: 12078
Added:
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/PrimitiveBean.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/PrimitiveMethodTest.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/PrimitiveValueProducer.java
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml
Modified:
modules/xml/trunk/docs/en-US/xml-general.xml
modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
Log:
added handling of primitive types in method resolution
Modified: modules/xml/trunk/docs/en-US/xml-general.xml
===================================================================
--- modules/xml/trunk/docs/en-US/xml-general.xml 2010-02-26 04:17:09 UTC (rev 12077)
+++ modules/xml/trunk/docs/en-US/xml-general.xml 2010-02-26 05:01:05 UTC (rev 12078)
@@ -126,10 +126,18 @@
<listitem><para><literal>value</literal></para></listitem>
<listitem><para><literal>key</literal></para></listitem>
<listitem><para><literal>entry</literal></para></listitem>
- <listitem><para><literal>array</literal></para></listitem>
<listitem><para><literal>e</literal> (alias for entry)</para></listitem>
<listitem><para><literal>v</literal> (alias for value)</para></listitem>
<listitem><para><literal>k</literal> (alias for key)</para></listitem>
+ <listitem><para><literal>array</literal></para></listitem>
+ <listitem><para><literal>int</literal></para></listitem>
+ <listitem><para><literal>short</literal></para></listitem>
+ <listitem><para><literal>long</literal></para></listitem>
+ <listitem><para><literal>byte</literal></para></listitem>
+ <listitem><para><literal>char</literal></para></listitem>
+ <listitem><para><literal>double</literal></para></listitem>
+ <listitem><para><literal>float</literal></para></listitem>
+ <listitem><para><literal>boolean</literal></para></listitem>
</itemizedlist>
<para>as well as classes from the following packages:</para>
@@ -236,6 +244,14 @@
<test:Qualifier2/>
</test:MethodValueBean>
</test:method>
+ <test:method>
+ <Produces/>
+ <test:Qualifier1/>
+ <array dimensions="2">
+ <test:Qualifier2/>
+ <test:MethodValueBean/>
+ </array>
+ </test:method>
</test:MethodBean>
</Beans>
@@ -257,10 +273,11 @@
]]>
</programlisting>
- <para>In this instance <literal>MethodBean</literal> has two methods, both of them rather imaginatively named <literal>method</literal>.
+ <para>In this instance <literal>MethodBean</literal> has three methods, all of them rather imaginatively named <literal>method</literal>.
The first <literal><test:method></literal> entry in the XML file configures the method that takes no arguments.
The <literal><Produces></literal> element makes it into a producer method. The next entry in the file configures
- the method that takes a <literal>MethodValueBean</literal> as a parameter.When configuring methods non-annotation classes are
+ the method that takes a <literal>MethodValueBean</literal> as a parameter. The final entry configures a method that takes a two
+ dimensional array of<literal>MethodValueBean</literal>'s as a parameter. When configuring methods non-annotation classes are
considered to represent method paramters. If these parameters have annotation children they are taken to be annotations
on the parameter.</para>
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-02-26 04:17:09 UTC (rev 12077)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-02-26 05:01:05 UTC (rev 12078)
@@ -5,11 +5,14 @@
package org.jboss.seam.xml.parser.namespace;
import org.jboss.seam.xml.model.ArrayXmlItem;
+import org.jboss.seam.xml.model.ClassXmlItem;
import org.jboss.seam.xml.model.EntryXmlItem;
import org.jboss.seam.xml.model.KeyXmlItem;
+import org.jboss.seam.xml.model.ParameterXmlItem;
import org.jboss.seam.xml.model.ValueXmlItem;
import org.jboss.seam.xml.model.VetoXmlItem;
import org.jboss.seam.xml.model.XmlItem;
+import org.jboss.seam.xml.model.XmlItemType;
import org.jboss.seam.xml.parser.SaxNode;
public class RootNamespaceElementResolver implements NamespaceElementResolver
@@ -55,7 +58,53 @@
{
return new VetoXmlItem(parent, node.getDocument(), node.getLineNo());
}
+ // now deal with primitive types
+ Class primType = null;
+ if (item.equals("int"))
+ {
+ primType = int.class;
+ }
+ else if (item.equals("short"))
+ {
+ primType = short.class;
+ }
+ else if (item.equals("long"))
+ {
+ primType = long.class;
+ }
+ else if (item.equals("byte"))
+ {
+ primType = byte.class;
+ }
+ else if (item.equals("char"))
+ {
+ primType = char.class;
+ }
+ else if (item.equals("double"))
+ {
+ primType = double.class;
+ }
+ else if (item.equals("float"))
+ {
+ primType = float.class;
+ }
+ else if (item.equals("boolean"))
+ {
+ primType = boolean.class;
+ }
+ if (primType != null)
+ {
+ if (parent != null && (parent.getType() == XmlItemType.METHOD || parent.getType() == XmlItemType.CLASS))
+ {
+ return new ParameterXmlItem(parent, primType, node.getDocument(), node.getLineNo());
+ }
+ else
+ {
+ return new ClassXmlItem(parent, primType, node.getDocument(), node.getLineNo());
+ }
+ }
+
return null;
}
Added: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/PrimitiveBean.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/PrimitiveBean.java (rev 0)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/PrimitiveBean.java 2010-02-26 05:01:05 UTC (rev 12078)
@@ -0,0 +1,18 @@
+package org.jboss.seam.xml.test.method;
+
+public class PrimitiveBean
+{
+ public int add(int val)
+ {
+ return val + 1;
+ }
+
+ public int[] add(int[] val)
+ {
+ for (int i = 0; i < val.length; ++i)
+ {
+ val[i] = val[i] + 1;
+ }
+ return val;
+ }
+}
Added: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/PrimitiveMethodTest.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/PrimitiveMethodTest.java (rev 0)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/PrimitiveMethodTest.java 2010-02-26 05:01:05 UTC (rev 12078)
@@ -0,0 +1,42 @@
+/*
+ * Distributed under the LGPL License
+ *
+ */
+package org.jboss.seam.xml.test.method;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.seam.xml.test.AbstractXMLTest;
+import org.testng.annotations.Test;
+
+public class PrimitiveMethodTest extends AbstractXMLTest
+{
+
+ @Override
+ protected String getXmlFileName()
+ {
+ return "primitive-method-beans.xml";
+ }
+
+ @Test
+ public void methodTest()
+ {
+ int x = getReference(int.class, new Qual1Lit());
+ assert x == 1;
+ int[] y = getReference(int[].class, new Qual2Lit());
+ for (int i = 0; i < y.length; ++i)
+ {
+ assert y[i] == i + 2;
+ }
+
+ }
+
+ class Qual1Lit extends AnnotationLiteral<Qualifier1>
+ {
+ };
+
+ class Qual2Lit extends AnnotationLiteral<Qualifier2>
+ {
+ };
+
+}
Added: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/PrimitiveValueProducer.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/PrimitiveValueProducer.java (rev 0)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/PrimitiveValueProducer.java 2010-02-26 05:01:05 UTC (rev 12078)
@@ -0,0 +1,9 @@
+package org.jboss.seam.xml.test.method;
+
+public class PrimitiveValueProducer
+{
+ public int value = 0;
+
+ public int[] value2 = { 1, 2, 3 };
+
+}
Added: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml (rev 0)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml 2010-02-26 05:01:05 UTC (rev 12078)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Beans xmlns="urn:seam:core"
+ xmlns:test="urn:java:org.jboss.seam.xml.test.method">
+
+
+ <test:Qualifier1>
+ <Qualifier/>
+ </test:Qualifier1>
+
+ <test:Qualifier2>
+ <Qualifier/>
+ </test:Qualifier2>
+
+ <test:PrimitiveBean>
+ <test:add>
+ <Produces/>
+ <test:Qualifier1/>
+ <int/>
+ </test:add>
+ <test:add>
+ <Produces/>
+ <test:Qualifier2/>
+ <array>
+ <int/>
+ </array>
+ </test:add>
+ </test:PrimitiveBean>
+
+ <test:PrimitiveValueProducer>
+ <test:value>
+ <Produces/>
+ </test:value>
+
+ <test:value2>
+ <Produces/>
+ </test:value2>
+ </test:PrimitiveValueProducer>
+
+</Beans>
\ No newline at end of file
14 years, 9 months
Seam SVN: r12077 - in modules/xml/trunk/src: main/java/org/jboss/seam/xml/parser/namespace and 2 other directories.
by seam-commits@lists.jboss.org
Author: swd847
Date: 2010-02-25 23:17:09 -0500 (Thu, 25 Feb 2010)
New Revision: 12077
Added:
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodValueArrayProducer.java
Modified:
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AnnotationXmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ArrayXmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ParameterXmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodBean.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodTarget.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodTest.java
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
Log:
added proper array parameter handling, including multi-dimensional arrays
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AnnotationXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AnnotationXmlItem.java 2010-02-26 03:11:50 UTC (rev 12076)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AnnotationXmlItem.java 2010-02-26 04:17:09 UTC (rev 12077)
@@ -4,23 +4,14 @@
*/
package org.jboss.seam.xml.model;
-import java.util.Collections;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
public class AnnotationXmlItem extends AbstractXmlItem
{
+ HashSet<XmlItemType> allowed = new HashSet<XmlItemType>();
- /**
- * create a class note. If the class is an annotation in can have inner text
- * to represent the 'value' of the annotation, if can also have atrributes to
- * represent other properties
- *
- * @param parent
- * @param c
- * @param innerText
- * @param attributes
- */
public AnnotationXmlItem(XmlItem parent, Class<?> c, String innerText, Map<String, String> attributes, String document, int lineno)
{
super(XmlItemType.ANNOTATION, parent, c, innerText, attributes, document, lineno);
@@ -31,11 +22,12 @@
attributes.put("value", innerText);
}
}
+ allowed.add(XmlItemType.ANNOTATION);
}
public Set<XmlItemType> getAllowedItem()
{
- return Collections.emptySet();
+ return allowed;
}
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ArrayXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ArrayXmlItem.java 2010-02-26 03:11:50 UTC (rev 12076)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ArrayXmlItem.java 2010-02-26 04:17:09 UTC (rev 12077)
@@ -4,144 +4,61 @@
*/
package org.jboss.seam.xml.model;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
+import java.lang.reflect.Array;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import org.jboss.seam.xml.fieldset.FieldValueObject;
import org.jboss.seam.xml.util.XmlConfigurationException;
-public class ArrayXmlItem implements XmlItem
+public class ArrayXmlItem extends ParameterXmlItem
{
- XmlItem child = null, parent;
+ Class javaClass = null;
- Class<?> javaClass;
+ int dimensions = 1;
- final String document;
-
- final int lineno;
-
- public ArrayXmlItem(XmlItem parent, String document, int lineno)
+ public ArrayXmlItem(XmlItem parent, Map<String, String> attributes, String document, int lineno)
{
- allowed.add(XmlItemType.CLASS);
- this.parent = parent;
- this.document = document;
- this.lineno = lineno;
- }
-
- public String getDocument()
- {
- return document;
- }
-
- public int getLineno()
- {
- return lineno;
- }
-
- Set<XmlItemType> allowed = new HashSet<XmlItemType>();
-
- public Set<XmlItemType> getAllowedItem()
- {
- return allowed;
- }
-
- public void addChild(XmlItem xmlItem)
- {
- if (child != null)
+ super(parent, null, document, lineno);
+ if (attributes.containsKey("dimensions"))
{
- throw new XmlConfigurationException("Array elements can only have one child", getDocument(), getLineno());
+ try
+ {
+ dimensions = Integer.parseInt(attributes.get("dimensions"));
+ }
+ catch (NumberFormatException e)
+ {
+ throw new XmlConfigurationException("dimensions attribute on <array> must be an integer", document, lineno);
+ }
}
- child = xmlItem;
}
- @SuppressWarnings("unchecked")
- public Map<String, String> getAttributes()
- {
- return Collections.EMPTY_MAP;
- }
-
- public List<XmlItem> getChildren()
- {
- return Collections.singletonList(child);
- }
-
- public Field getField()
- {
- return null;
- }
-
- public FieldValueObject getFieldValue()
- {
- return null;
- }
-
- public String getInnerText()
- {
- return null;
- }
-
- public Class getJavaClass()
- {
- return javaClass;
- }
-
- public Method getMethod()
- {
- return null;
- }
-
- public XmlItem getParent()
- {
- return parent;
- }
-
- public XmlItemType getType()
- {
- return XmlItemType.CLASS;
- }
-
public boolean resolveChildren()
{
- if (child == null)
+ List<ClassXmlItem> classXmlItems = getChildrenOfType(ClassXmlItem.class);
+ if (classXmlItems.isEmpty())
{
throw new XmlConfigurationException("<array> element must have a child specifying the array type", getDocument(), getLineno());
}
- Class<?> l = child.getJavaClass();
- try
+ else if (classXmlItems.size() != 1)
{
- javaClass = getClass().getClassLoader().loadClass("[L" + l.getName() + ";");
+ throw new XmlConfigurationException("<array> element must have a single child specifying the array type", getDocument(), getLineno());
}
- catch (ClassNotFoundException e)
+ int[] dims = new int[dimensions];
+ for (int i = 0; i < dimensions; ++i)
{
- try
- {
- javaClass = Thread.currentThread().getContextClassLoader().loadClass("[L" + l.getName() + ";");
- }
- catch (ClassNotFoundException e2)
- {
- throw new XmlConfigurationException("Cannot create array class from " + l.getName(), getDocument(), getLineno());
- }
+ dims[i] = 0;
}
+ Class<?> l = classXmlItems.get(0).getJavaClass();
+ javaClass = Array.newInstance(l, dims).getClass();
+
return true;
}
- public <T> List<T> getChildrenOfType(Class<T> type)
+
+ @Override
+ public Class<?> getJavaClass()
{
- List<T> ret = new ArrayList<T>();
- for(XmlItem i : getChildren())
- {
- if(type.isAssignableFrom(i.getClass()))
- {
- ret.add((T)i);
- }
- }
- return ret;
+ return javaClass;
}
-
+
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java 2010-02-26 03:11:50 UTC (rev 12076)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java 2010-02-26 04:17:09 UTC (rev 12077)
@@ -12,16 +12,6 @@
HashSet<XmlItemType> allowed = new HashSet<XmlItemType>();
- /**
- * create a class note. If the class is an annotation in can have inner text
- * to represent the 'value' of the annotation, if can also have atrributes to
- * represent other properties
- *
- * @param parent
- * @param c
- * @param innerText
- * @param attributes
- */
public ClassXmlItem(XmlItem parent, Class<?> c, String document, int lineno)
{
super(XmlItemType.CLASS, parent, c, null, null, document, lineno);
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-02-26 03:11:50 UTC (rev 12076)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-02-26 04:17:09 UTC (rev 12077)
@@ -30,7 +30,7 @@
import org.jboss.weld.extensions.util.annotated.NewAnnotatedTypeBuilder;
/**
- * Parser for xml configration
+ * Builds an XML result from sax nodes
*
* @author stuart
*
@@ -71,6 +71,7 @@
if (node.getNamespaceUri() != null)
{
XmlItem rb = resolveNode(node, null);
+ // validateXmlItem(rb);
addNodeToResult(ret, rb);
}
}
@@ -174,57 +175,53 @@
{
ResultType ret = null;
- for (XmlItem it : item.getChildren())
+ for (AnnotationXmlItem it : item.getChildrenOfType(AnnotationXmlItem.class))
{
- if (it.getType() == XmlItemType.ANNOTATION)
+ if (it.getJavaClass() == InterceptorBinding.class)
{
- if (it.getJavaClass() == InterceptorBinding.class)
+ if (ret != null)
{
- if (ret != null)
- {
- throw new XmlConfigurationException("Element cannot be both an INTERCEPTOR_BINDING and a " + ret.toString(), item.getDocument(), item.getLineno());
- }
- else
- {
- ret = ResultType.INTERCEPTOR_BINDING;
- }
+ throw new XmlConfigurationException("Element cannot be both an INTERCEPTOR_BINDING and a " + ret.toString(), item.getDocument(), item.getLineno());
}
- else if (it.getJavaClass() == Qualifier.class)
+ else
{
- if (ret != null)
- {
- throw new XmlConfigurationException("Element cannot be both an QUALIFIER and a " + ret.toString(), item.getDocument(), item.getLineno());
- }
- else
- {
- ret = ResultType.QUALIFIER;
- }
+ ret = ResultType.INTERCEPTOR_BINDING;
}
- else if (it.getJavaClass() == Stereotype.class)
+ }
+ else if (it.getJavaClass() == Qualifier.class)
+ {
+ if (ret != null)
{
- if (ret != null)
- {
- throw new XmlConfigurationException("Element cannot be both an STEREOTYPE and a " + ret.toString(), item.getDocument(), item.getLineno());
- }
- else
- {
- ret = ResultType.STEREOTYPE;
- }
+ throw new XmlConfigurationException("Element cannot be both an QUALIFIER and a " + ret.toString(), item.getDocument(), item.getLineno());
}
+ else
+ {
+ ret = ResultType.QUALIFIER;
+ }
}
- else if (it.getType() == XmlItemType.VETO)
+ else if (it.getJavaClass() == Stereotype.class)
{
if (ret != null)
{
- throw new XmlConfigurationException("Element cannot be both an VETO and a " + ret.toString(), item.getDocument(), item.getLineno());
+ throw new XmlConfigurationException("Element cannot be both an STEREOTYPE and a " + ret.toString(), item.getDocument(), item.getLineno());
}
else
{
- ret = ResultType.VETO;
+ ret = ResultType.STEREOTYPE;
}
}
-
}
+ for (VetoXmlItem it : item.getChildrenOfType(VetoXmlItem.class))
+ {
+ if (ret != null)
+ {
+ throw new XmlConfigurationException("Element cannot be both an VETO and a " + ret.toString(), item.getDocument(), item.getLineno());
+ }
+ else
+ {
+ ret = ResultType.VETO;
+ }
+ }
if (ret == null)
{
ret = ResultType.BEAN;
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ParameterXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ParameterXmlItem.java 2010-02-26 03:11:50 UTC (rev 12076)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ParameterXmlItem.java 2010-02-26 04:17:09 UTC (rev 12077)
@@ -7,26 +7,20 @@
import java.util.HashSet;
import java.util.Set;
+/**
+ * represents a parameter of a constructor or method
+ *
+ * @author Stuart Douglas <stuart(a)baileyroberts.com.au>
+ *
+ */
public class ParameterXmlItem extends AbstractXmlItem
{
-
HashSet<XmlItemType> allowed = new HashSet<XmlItemType>();
- /**
- * create a class note. If the class is an annotation in can have inner text
- * to represent the 'value' of the annotation, if can also have atrributes to
- * represent other properties
- *
- * @param parent
- * @param c
- * @param innerText
- * @param attributes
- */
public ParameterXmlItem(XmlItem parent, Class<?> c, String document, int lineno)
{
super(XmlItemType.PARAMETER, parent, c, null, null, document, lineno);
allowed.add(XmlItemType.ANNOTATION);
-
}
public Set<XmlItemType> getAllowedItem()
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-02-26 03:11:50 UTC (rev 12076)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-02-26 04:17:09 UTC (rev 12077)
@@ -6,5 +6,5 @@
public enum XmlItemType
{
- CLASS, METHOD, FIELD, ANNOTATION, VALUE, VETO, ENTRY, KEY, DEPENDENCY,PARAMETER;
+ CLASS, METHOD, FIELD, ANNOTATION, VALUE, VETO, ENTRY, KEY, DEPENDENCY, PARAMETER, ARRAY;
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-02-26 03:11:50 UTC (rev 12076)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-02-26 04:17:09 UTC (rev 12077)
@@ -49,13 +49,13 @@
}
else if (item.equals("array"))
{
- return new ArrayXmlItem(parent, node.getDocument(), node.getLineNo());
+ return new ArrayXmlItem(parent, node.getAttributes(), node.getDocument(), node.getLineNo());
}
else if (item.equals("veto"))
{
return new VetoXmlItem(parent, node.getDocument(), node.getLineNo());
}
-
+
return null;
}
Modified: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodBean.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodBean.java 2010-02-26 03:11:50 UTC (rev 12076)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodBean.java 2010-02-26 04:17:09 UTC (rev 12077)
@@ -17,4 +17,9 @@
return bean.value + 1;
}
+ public long method(MethodValueBean[][] beans)
+ {
+ return beans.length;
+ }
+
}
Modified: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodTarget.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodTarget.java 2010-02-26 03:11:50 UTC (rev 12076)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodTarget.java 2010-02-26 04:17:09 UTC (rev 12077)
@@ -8,4 +8,6 @@
{
public int value1, value2;
+
+ public long longValue;
}
Modified: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodTest.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodTest.java 2010-02-26 03:11:50 UTC (rev 12076)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodTest.java 2010-02-26 04:17:09 UTC (rev 12077)
@@ -23,6 +23,7 @@
assert x != null;
assert x.value1 == 1;
assert x.value2 == 11;
+ assert x.longValue == 10;
}
Added: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodValueArrayProducer.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodValueArrayProducer.java (rev 0)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/method/MethodValueArrayProducer.java 2010-02-26 04:17:09 UTC (rev 12077)
@@ -0,0 +1,13 @@
+package org.jboss.seam.xml.test.method;
+
+import javax.enterprise.inject.Produces;
+
+public class MethodValueArrayProducer
+{
+ @Produces
+ @Qualifier2
+ public MethodValueBean[][] createMethodValueBeans()
+ {
+ return new MethodValueBean[10][10];
+ }
+}
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-02-26 03:11:50 UTC (rev 12076)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-02-26 04:17:09 UTC (rev 12077)
@@ -26,11 +26,22 @@
<test:Qualifier2/>
</test:MethodValueBean>
</test:method>
+
+ <test:method>
+ <Produces/>
+ <test:Qualifier1/>
+ <array dimensions="2">
+ <test:Qualifier2/>
+ <test:MethodValueBean/>
+ </array>
+ </test:method>
+
</test:MethodBean>
<test:MethodTarget>
<test:value1><Inject/></test:value1>
<test:value2><Inject/><test:Qualifier1/></test:value2>
+ <test:longValue><Inject/><test:Qualifier1/></test:longValue>
</test:MethodTarget>
<test:MethodValueBean>
14 years, 9 months
Seam SVN: r12076 - in modules/xml/trunk/src: main/java/org/jboss/seam/xml/parser/namespace and 1 other directories.
by seam-commits@lists.jboss.org
Author: swd847
Date: 2010-02-25 22:11:50 -0500 (Thu, 25 Feb 2010)
New Revision: 12076
Added:
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ParameterXmlItem.java
Modified:
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AbstractXmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ArrayXmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/FieldXmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/MethodXmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/NamespaceResolverTest.java
Log:
Cleaned up the XML object model somewhat
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AbstractXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AbstractXmlItem.java 2010-02-26 01:43:39 UTC (rev 12075)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AbstractXmlItem.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -4,16 +4,12 @@
*/
package org.jboss.seam.xml.model;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.jboss.seam.xml.fieldset.FieldValueObject;
-
public abstract class AbstractXmlItem implements XmlItem
{
final XmlItemType type;
@@ -82,16 +78,6 @@
return type;
}
- public Field getField()
- {
- return null;
- }
-
- public Method getMethod()
- {
- return null;
- }
-
public Class<?> getJavaClass()
{
return javaClass;
@@ -107,8 +93,16 @@
return attributes;
}
- public FieldValueObject getFieldValue()
+ public <T> List<T> getChildrenOfType(Class<T> type)
{
- return null;
+ List<T> ret = new ArrayList<T>();
+ for (XmlItem i : children)
+ {
+ if (type.isAssignableFrom(i.getClass()))
+ {
+ ret.add((T) i);
+ }
+ }
+ return ret;
}
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ArrayXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ArrayXmlItem.java 2010-02-26 01:43:39 UTC (rev 12075)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ArrayXmlItem.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -6,6 +6,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -130,5 +131,17 @@
}
return true;
}
-
+ public <T> List<T> getChildrenOfType(Class<T> type)
+ {
+ List<T> ret = new ArrayList<T>();
+ for(XmlItem i : getChildren())
+ {
+ if(type.isAssignableFrom(i.getClass()))
+ {
+ ret.add((T)i);
+ }
+ }
+ return ret;
+ }
+
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java 2010-02-26 01:43:39 UTC (rev 12075)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -25,17 +25,10 @@
public ClassXmlItem(XmlItem parent, Class<?> c, String document, int lineno)
{
super(XmlItemType.CLASS, parent, c, null, null, document, lineno);
- if (innerText != null)
- {
- if (!innerText.trim().equals(""))
- {
- attributes.put("value", innerText);
- }
- }
allowed.add(XmlItemType.ANNOTATION);
allowed.add(XmlItemType.FIELD);
allowed.add(XmlItemType.METHOD);
- allowed.add(XmlItemType.CLASS);
+ allowed.add(XmlItemType.PARAMETER);
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/FieldXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/FieldXmlItem.java 2010-02-26 01:43:39 UTC (rev 12075)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/FieldXmlItem.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -49,7 +49,6 @@
return field;
}
- @Override
public FieldValueObject getFieldValue()
{
return fieldValue;
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/MethodXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/MethodXmlItem.java 2010-02-26 01:43:39 UTC (rev 12075)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/MethodXmlItem.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -44,7 +44,7 @@
}
method = found;
allowed.add(XmlItemType.ANNOTATION);
- allowed.add(XmlItemType.CLASS);
+ allowed.add(XmlItemType.PARAMETER);
}
/**
@@ -66,7 +66,7 @@
List<Class<?>> rtList = new ArrayList<Class<?>>();
for (XmlItem c : children)
{
- if (c.getType() == XmlItemType.CLASS)
+ if (c.getType() == XmlItemType.PARAMETER)
{
Class<?> cl = c.getJavaClass();
rtList.add(cl);
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-02-26 01:43:39 UTC (rev 12075)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -96,22 +96,18 @@
BeanResult<?> tp = buildAnnotatedType(rb);
ret.getBeans().add(tp);
List<FieldValueObject> fields = new ArrayList<FieldValueObject>();
- for (XmlItem xi : rb.getChildren())
+ for (FieldXmlItem xi : rb.getChildrenOfType(FieldXmlItem.class))
{
- if (xi.getType() == XmlItemType.FIELD)
+ FieldValueObject f = xi.getFieldValue();
+ if (f != null)
{
- FieldValueObject f = xi.getFieldValue();
- if (f != null)
- {
- fields.add(f);
- }
+ fields.add(f);
}
}
if (!fields.isEmpty())
{
ret.getFieldValues().put(tp, fields);
}
-
}
else if (type == ResultType.QUALIFIER)
{
@@ -123,7 +119,7 @@
}
else if (type == ResultType.STEREOTYPE)
{
- addSteriotypeToResult(ret, rb);
+ addStereotypeToResult(ret, rb);
}
}
else if (rb.getType() == XmlItemType.VETO)
@@ -243,65 +239,50 @@
NewAnnotatedTypeBuilder<T> type = result.getBuilder();
// list of constructor arguments
List<XmlItem> constList = new ArrayList<XmlItem>();
- for (XmlItem item : rb.getChildren())
+
+ for (AnnotationXmlItem item : rb.getChildrenOfType(AnnotationXmlItem.class))
{
- if (item.getType() == XmlItemType.ANNOTATION)
- {
+ Annotation a = createAnnotation(item);
+ type.addToClass(a);
+ }
- Annotation a = createAnnotation(item);
- type.addToClass(a);
- }
- else if (item.getType() == XmlItemType.CLASS)
+ for (ParameterXmlItem item : rb.getChildrenOfType(ParameterXmlItem.class))
+ {
+ constList.add(item);
+ }
+ for (FieldXmlItem item : rb.getChildrenOfType(FieldXmlItem.class))
+ {
+ for (AnnotationXmlItem fi : item.getChildrenOfType(AnnotationXmlItem.class))
{
- constList.add(item);
-
+ Annotation a = createAnnotation(fi);
+ type.addToField(item.getField(), a);
}
- else if (item.getType() == XmlItemType.FIELD)
+ }
+ for (MethodXmlItem item : rb.getChildrenOfType(MethodXmlItem.class))
+ {
+ int paramCount = 0;
+
+ for (AnnotationXmlItem fi : item.getChildrenOfType(AnnotationXmlItem.class))
{
- for (XmlItem fi : item.getChildren())
- {
- if (fi.getType() == XmlItemType.ANNOTATION)
- {
- Annotation a = createAnnotation(fi);
- type.addToField(item.getField(), a);
- }
- }
+ Annotation a = createAnnotation(fi);
+ type.addToMethod(item.getMethod(), a);
}
- else if (item.getType() == XmlItemType.METHOD)
+ for (ParameterXmlItem fi : item.getChildrenOfType(ParameterXmlItem.class))
{
- int paramCount = 0;
- for (XmlItem fi : item.getChildren())
+ int param = paramCount++;
+ for (AnnotationXmlItem pan : fi.getChildrenOfType(AnnotationXmlItem.class))
{
- if (fi.getType() == XmlItemType.ANNOTATION)
- {
-
- // TODO: pass in attribute map
- Annotation a = createAnnotation(fi);
- type.addToMethod(item.getMethod(), a);
- }
- else if (fi.getType() == XmlItemType.CLASS)
- {
- int param = paramCount++;
- for (XmlItem pan : fi.getChildren())
- {
- if (pan.getType() == XmlItemType.ANNOTATION)
- {
- Annotation a = createAnnotation(pan);
- type.addToMethodParameter(item.getMethod(), param, a);
- }
- else
- {
- throw new XmlConfigurationException("Method parameters may only have annotations as children in " + item.getJavaClass().getName(), rb.getDocument(), rb.getLineno());
- }
- }
- }
+ Annotation a = createAnnotation(pan);
+ type.addToMethodParameter(item.getMethod(), param, a);
}
}
- else if (item.getType() == XmlItemType.DEPENDENCY)
- {
- result.getDependencies().add(item.getInnerText());
- }
+
}
+ for (DependsXmlItem item : rb.getChildrenOfType(DependsXmlItem.class))
+ {
+ result.addDependency(item.getInnerText());
+ }
+
if (!constList.isEmpty())
{
// the bean defined constructor arguments
@@ -310,7 +291,7 @@
}
@SuppressWarnings("unchecked")
- void addSteriotypeToResult(XmlResult ret, XmlItem rb)
+ void addStereotypeToResult(XmlResult ret, XmlItem rb)
{
Annotation[] values = new Annotation[rb.getChildren().size()];
@@ -319,7 +300,7 @@
{
if (item.getType() == XmlItemType.ANNOTATION)
{
- Annotation a = createAnnotation(item);
+ Annotation a = createAnnotation((AnnotationXmlItem) item);
values[count] = a;
}
else
@@ -333,7 +314,7 @@
}
@SuppressWarnings("unchecked")
- Annotation createAnnotation(XmlItem item)
+ Annotation createAnnotation(AnnotationXmlItem item)
{
Map<String, Object> typedVars = new HashMap<String, Object>();
Class<?> anClass = item.getJavaClass();
@@ -353,7 +334,7 @@
typedVars.put(mname, XmlObjectConverter.convert(returnType, e.getValue()));
}
- return ac.get(item.getJavaClass(), typedVars);
+ return ac.get((Class) item.getJavaClass(), typedVars);
}
public void validateXmlItem(XmlItem item)
Added: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ParameterXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ParameterXmlItem.java (rev 0)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ParameterXmlItem.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -0,0 +1,37 @@
+/*
+ * Distributed under the LGPL License
+ *
+ */
+package org.jboss.seam.xml.model;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class ParameterXmlItem extends AbstractXmlItem
+{
+
+ HashSet<XmlItemType> allowed = new HashSet<XmlItemType>();
+
+ /**
+ * create a class note. If the class is an annotation in can have inner text
+ * to represent the 'value' of the annotation, if can also have atrributes to
+ * represent other properties
+ *
+ * @param parent
+ * @param c
+ * @param innerText
+ * @param attributes
+ */
+ public ParameterXmlItem(XmlItem parent, Class<?> c, String document, int lineno)
+ {
+ super(XmlItemType.PARAMETER, parent, c, null, null, document, lineno);
+ allowed.add(XmlItemType.ANNOTATION);
+
+ }
+
+ public Set<XmlItemType> getAllowedItem()
+ {
+ return allowed;
+ }
+
+}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItem.java 2010-02-26 01:43:39 UTC (rev 12075)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItem.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -4,14 +4,9 @@
*/
package org.jboss.seam.xml.model;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.util.List;
-import java.util.Map;
import java.util.Set;
-import org.jboss.seam.xml.fieldset.FieldValueObject;
-
public interface XmlItem
{
@@ -25,28 +20,22 @@
public XmlItemType getType();
- public Field getField();
-
- public Method getMethod();
-
public Class getJavaClass();
/**
- * attempts to resolve any information that is not availbile at parse time
+ * attempts to resolve any information that is not available at parse time
*
* @param childeren
* @return
*/
public boolean resolveChildren();
- public Map<String, String> getAttributes();
-
- public FieldValueObject getFieldValue();
-
public Set<XmlItemType> getAllowedItem();
int getLineno();
String getDocument();
+ public <T> List<T> getChildrenOfType(Class<T> type);
+
}
\ No newline at end of file
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-02-26 01:43:39 UTC (rev 12075)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -6,5 +6,5 @@
public enum XmlItemType
{
- CLASS, METHOD, FIELD, ANNOTATION, VALUE, VETO, ENTRY, KEY, DEPENDENCY;
+ CLASS, METHOD, FIELD, ANNOTATION, VALUE, VETO, ENTRY, KEY, DEPENDENCY,PARAMETER;
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java 2010-02-26 01:43:39 UTC (rev 12075)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -11,6 +11,7 @@
import org.jboss.seam.xml.model.AnnotationXmlItem;
import org.jboss.seam.xml.model.ClassXmlItem;
+import org.jboss.seam.xml.model.ParameterXmlItem;
import org.jboss.seam.xml.model.XmlItem;
import org.jboss.seam.xml.model.XmlItemType;
import org.jboss.seam.xml.parser.SaxNode;
@@ -52,7 +53,15 @@
}
else
{
- return new ClassXmlItem(parent, c, node.getDocument(), node.getLineNo());
+ //if it is a method or constructor parameter
+ if(parent != null && (parent.getType() == XmlItemType.METHOD || parent.getType() == XmlItemType.CLASS))
+ {
+ return new ParameterXmlItem(parent, c, node.getDocument(), node.getLineNo());
+ }
+ else
+ {
+ return new ClassXmlItem(parent, c, node.getDocument(), node.getLineNo());
+ }
}
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-02-26 01:43:39 UTC (rev 12075)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -5,7 +5,6 @@
package org.jboss.seam.xml.parser.namespace;
import org.jboss.seam.xml.model.ArrayXmlItem;
-import org.jboss.seam.xml.model.DependsXmlItem;
import org.jboss.seam.xml.model.EntryXmlItem;
import org.jboss.seam.xml.model.KeyXmlItem;
import org.jboss.seam.xml.model.ValueXmlItem;
@@ -56,10 +55,7 @@
{
return new VetoXmlItem(parent, node.getDocument(), node.getLineNo());
}
- else if (item.equals("depends"))
- {
- return new DependsXmlItem(parent, node.getInnerText(), node.getDocument(), node.getLineNo());
- }
+
return null;
}
Modified: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java 2010-02-26 01:43:39 UTC (rev 12075)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -51,7 +51,13 @@
}
else if (beans.size() != 1)
{
- throw new RuntimeException("More than one bean found with class: " + clazz + " and bindings " + bindings.toString());
+ StringBuilder bs = new StringBuilder("[");
+ for(Annotation a : bindings)
+ {
+ bs.append(a.toString() + ",");
+ }
+ bs.append("]");
+ throw new RuntimeException("More than one bean found with class: " + clazz + " and bindings " + bs);
}
Bean bean = beans.iterator().next();
return (T) bean.create(manager.createCreationalContext(bean));
Modified: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/NamespaceResolverTest.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/NamespaceResolverTest.java 2010-02-26 01:43:39 UTC (rev 12075)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/NamespaceResolverTest.java 2010-02-26 03:11:50 UTC (rev 12076)
@@ -7,6 +7,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.jboss.seam.xml.model.FieldXmlItem;
+import org.jboss.seam.xml.model.MethodXmlItem;
import org.jboss.seam.xml.model.XmlItem;
import org.jboss.seam.xml.model.XmlItemType;
import org.jboss.seam.xml.parser.SaxNode;
@@ -48,12 +50,12 @@
method.resolveChildren();
- assert method.getMethod() != null : "Could not resolve method";
- assert method.getMethod().getParameterTypes().length == 0 : "Wrong method was resolved";
+ assert ((MethodXmlItem) method).getMethod() != null : "Could not resolve method";
+ assert ((MethodXmlItem) method).getMethod().getParameterTypes().length == 0 : "Wrong method was resolved";
XmlItem field = resolver.getItemForNamespace(new SaxNode("field1", null, null, null, null, 0), item);
- assert field.getType() == XmlItemType.FIELD : "Element of wrong type returned";
- assert field.getField() != null : "field was not set";
+ assert ((FieldXmlItem) field).getType() == XmlItemType.FIELD : "Element of wrong type returned";
+ assert ((FieldXmlItem) field).getField() != null : "field was not set";
}
14 years, 9 months
Seam SVN: r12075 - in modules/xml/trunk: src/main/java/org/jboss/seam/xml/parser and 1 other directories.
by seam-commits@lists.jboss.org
Author: swd847
Date: 2010-02-25 20:43:39 -0500 (Thu, 25 Feb 2010)
New Revision: 12075
Modified:
modules/xml/trunk/pom.xml
modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/SaxNode.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java
Log:
updated to weld 1.0.1
Modified: modules/xml/trunk/pom.xml
===================================================================
--- modules/xml/trunk/pom.xml 2010-02-25 11:42:00 UTC (rev 12074)
+++ modules/xml/trunk/pom.xml 2010-02-26 01:43:39 UTC (rev 12075)
@@ -37,12 +37,12 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>1.0</version>
+ <version>1.0-SP1</version>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-Final</version>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-se</artifactId>
- <version>1.0.0-CR2</version>
+ <version>1.0.1-Final</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/SaxNode.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/SaxNode.java 2010-02-25 11:42:00 UTC (rev 12074)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/SaxNode.java 2010-02-26 01:43:39 UTC (rev 12075)
@@ -33,7 +33,7 @@
public String getInnerText()
{
- if (innerText != null && innerText.isEmpty())
+ if (innerText != null && innerText.length() == 0)
{
return null;
}
Modified: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java 2010-02-25 11:42:00 UTC (rev 12074)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java 2010-02-26 01:43:39 UTC (rev 12075)
@@ -9,10 +9,9 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
-import org.jboss.weld.environment.se.StartMain;
-import org.jboss.weld.environment.se.events.Shutdown;
+import org.jboss.weld.environment.se.Weld;
+import org.jboss.weld.environment.se.WeldContainer;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -22,6 +21,8 @@
public static String[] ARGS_EMPTY = new String[] {};
protected BeanManager manager;
+
+ Weld weld;
protected abstract String getXmlFileName();
@@ -30,13 +31,15 @@
{
String fileName = getClass().getPackage().getName().replace('.', '/') + "/" + getXmlFileName();
TestXmlProvider.fileName = fileName;
- manager = new StartMain(ARGS_EMPTY).go();
+ weld = new Weld();
+ WeldContainer container = weld.initialize();
+ manager = container.getBeanManager();
}
@AfterClass
public void teardown()
{
- manager.fireEvent(manager, new ShutdownAnnotation());
+ weld.shutdown();
}
public <T> T getReference(Class<T> clazz, Annotation... bindings)
@@ -54,8 +57,5 @@
return (T) bean.create(manager.createCreationalContext(bean));
}
- protected static class ShutdownAnnotation extends AnnotationLiteral<org.jboss.weld.environment.se.events.Shutdown> implements Shutdown
- {
- }
-
+
}
14 years, 9 months
Seam SVN: r12074 - branches/community/Seam_2_2/src/test/ftest/examples.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-02-25 06:42:00 -0500 (Thu, 25 Feb 2010)
New Revision: 12074
Modified:
branches/community/Seam_2_2/src/test/ftest/examples/build.xml
Log:
fixed build script for ftests - ant 1.8
Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2010-02-24 15:13:21 UTC (rev 12073)
+++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2010-02-25 11:42:00 UTC (rev 12074)
@@ -242,7 +242,8 @@
</ant>
</target>
- <target name="container.properties" depends="set.deploy.properties" unless="container.home">
+ <!-- <target name="container.properties" depends="set.deploy.properties" unless="container.home">-->
+ <target name="container.properties" depends="set.deploy.properties">
<set.container.properties container="${container}" />
</target>
@@ -260,7 +261,7 @@
<property name="context.path" value="${(a){container}.context.path}" />
<property name="wait.url" value="${context.path}" />
<property name="wait.time" value="${(a){container}.deploy.waittime}" />
- <propertyset id="deploy.properties" refid="${container}.deploy.properties" />
+ <propertyset id="deploy.properties" refid="@{container}.deploy.properties" />
<echo>Container properties set</echo>
</sequential>
</macrodef>
14 years, 9 months
Seam SVN: r12073 - branches/community/Seam_2_2/build.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-02-24 10:13:21 -0500 (Wed, 24 Feb 2010)
New Revision: 12073
Modified:
branches/community/Seam_2_2/build/default.build.properties
Log:
revert qualifier to SNAPSHOT
Modified: branches/community/Seam_2_2/build/default.build.properties
===================================================================
--- branches/community/Seam_2_2/build/default.build.properties 2010-02-24 14:30:07 UTC (rev 12072)
+++ branches/community/Seam_2_2/build/default.build.properties 2010-02-24 15:13:21 UTC (rev 12073)
@@ -8,7 +8,7 @@
major.version 2
minor.version .2
patchlevel .1
-qualifier .CR1
+qualifier -SNAPSHOT
#
# Other program locations
# -----------------------
14 years, 9 months