February 2007 - hibernate-commits

Hibernate SVN: r11138 - branches/HQL_ANTLR_2/Hibernate3/src/org/hibernate/hql/ast/resolve.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-02-02 12:45:08 -0500 (Fri, 02 Feb 2007) New Revision: 11138 Modified: branches/HQL_ANTLR_2/Hibernate3/src/org/hibernate/hql/ast/resolve/EntityPersisterReference.java branches/HQL_ANTLR_2/Hibernate3/src/org/hibernate/hql/ast/resolve/PersisterReference.java Log: minor Modified: branches/HQL_ANTLR_2/Hibernate3/src/org/hibernate/hql/ast/resolve/EntityPersisterReference.java =================================================================== --- branches/HQL_ANTLR_2/Hibernate3/src/org/hibernate/hql/ast/resolve/EntityPersisterReference.java 2007-02-01 23:11:49 UTC (rev 11137) +++ branches/HQL_ANTLR_2/Hibernate3/src/org/hibernate/hql/ast/resolve/EntityPersisterReference.java 2007-02-02 17:45:08 UTC (rev 11138) @@ -12,8 +12,6 @@ public class EntityPersisterReference extends PersisterReference { private String entityName; - private String alias; - private boolean propertyFetch; private transient Queryable persister; /** @@ -30,11 +28,6 @@ initialize( alias, propertyFetch ); } - protected void initialize(String alias, boolean propertyFetch) { - this.alias = alias; - this.propertyFetch = propertyFetch; - } - /** * Retrieves a reference to the underlying entity persister. * @@ -58,26 +51,6 @@ } /** - * Retrieve the alias by which the persister reference can be located from the - * {@link PersisterReferenceContext}. - * - * @return The HQL alias. - */ - public String getAlias() { - return alias; - } - - /** - * Is lazy property fetching enabled for this persister reference. - * - * @return True if this persister reference indicates that lazy properties - * be immediately fetched; false otherwise. - */ - public boolean isPropertyFetch() { - return propertyFetch; - } - - /** * {@inheritDoc} */ public AssociationType getPersisterType() { @@ -107,7 +80,7 @@ * {@inheritDoc} */ public String toString() { - return "EntityPersisterReference {entity-name=" + entityName + ", alias=" + alias + "}"; + return "EntityPersisterReference {entity-name=" + entityName + ", alias=" + getAlias() + "}"; } } Modified: branches/HQL_ANTLR_2/Hibernate3/src/org/hibernate/hql/ast/resolve/PersisterReference.java =================================================================== --- branches/HQL_ANTLR_2/Hibernate3/src/org/hibernate/hql/ast/resolve/PersisterReference.java 2007-02-01 23:11:49 UTC (rev 11137) +++ branches/HQL_ANTLR_2/Hibernate3/src/org/hibernate/hql/ast/resolve/PersisterReference.java 2007-02-02 17:45:08 UTC (rev 11138) @@ -17,6 +17,8 @@ */ public abstract class PersisterReference extends Node implements Aliasable, ResolutionContextAwareNode { + private String alias; + private boolean propertyFetch; private ResolutionContext resolutionContext; private final Map reusableJoinsByProperty = new HashMap(); @@ -29,6 +31,16 @@ public abstract String getName(); /** + * Retrieve the alias by which the persister reference can be located from the + * {@link PersisterReferenceContext}. + * + * @return The HQL alias. + */ + public String getAlias() { + return alias; + } + + /** * The type represented by this persister reference. * * @return The type. @@ -54,6 +66,16 @@ public abstract Type getPropertyType(String propertyName); /** + * Is lazy property fetching enabled for this persister reference. + * + * @return True if this persister reference indicates that lazy properties + * be immediately fetched; false otherwise. + */ + public boolean isPropertyFetch() { + return propertyFetch; + } + + /** * Get the loggable text of this persister reference. * * @return The loggable text. @@ -93,4 +115,9 @@ public void injectResolutionContext(ResolutionContext resolutionContext) { this.resolutionContext = resolutionContext; } + + protected void initialize(String alias, boolean propertyFetch) { + this.alias = alias; + this.propertyFetch = propertyFetch; + } }

17 years, 2 months

1
0
0 / 0

Hibernate SVN: r11137 - in branches/HAN_SPLIT/HibernateExt/commons-annotations: lib and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-02-01 18:11:49 -0500 (Thu, 01 Feb 2007) New Revision: 11137 Added: branches/HAN_SPLIT/HibernateExt/commons-annotations/build.xml branches/HAN_SPLIT/HibernateExt/commons-annotations/changelog.txt branches/HAN_SPLIT/HibernateExt/commons-annotations/lgpl.txt branches/HAN_SPLIT/HibernateExt/commons-annotations/lib/ branches/HAN_SPLIT/HibernateExt/commons-annotations/lib/README.txt branches/HAN_SPLIT/HibernateExt/commons-annotations/readme.txt Log: Add commons-annotations build system and various files Added: branches/HAN_SPLIT/HibernateExt/commons-annotations/build.xml =================================================================== --- branches/HAN_SPLIT/HibernateExt/commons-annotations/build.xml (rev 0) +++ branches/HAN_SPLIT/HibernateExt/commons-annotations/build.xml 2007-02-01 23:11:49 UTC (rev 11137) @@ -0,0 +1,133 @@ +<project name="Hibernate Commons Annotations" default="dist" basedir="."> + +  + <property file="build.properties"/> + <property file="${user.home}/.ant.properties"/> + +  + <property name="Name" value="Hibernate Commons Annotations"/> + <property name="name" value="hibernate-commons-annotations"/> + <property name="version" value="3.2.2.GA"/> + <property name="javadoc.packagenames" value="org.hibernate.commons.annotations.*"/> + <property name="copy.test" value="true"/> + <property name="javac.source" value="1.5"/> + <property name="javac.target" value="1.5"/> + <property name="common.dir" value="${basedir}/../common"/> + <property name="hibernate-core.jar.available" value="true"/> + <property name="jpa-api.jar" value="${basedir}/../ejb-api/build/ejb3-persistence.jar"/> + + <import file="${common.dir}/common-build.xml"/> + + <path id="lib.class.path"> + <fileset dir="${hibernate-core.lib.dir}"> + <include name="commons-logging*.jar"/> + <include name="log4j*.jar"/> + </fileset> + <fileset dir="${lib.dir}"> + <include name="*.jar"/> + </fileset> + <path refid="lib.moduleclass.path"/> + <pathelement path="${clover.jar}"/> + </path> + + <path id="junit.moduleclasspath"> + <pathelement location="${src.dir}"/> + <pathelement location="${test.dir}"/> + <pathelement location="${jpa-api.jar}"/> + <fileset dir="${hibernate-core.lib.dir}"> + <include name="junit*.jar"/> + </fileset> + </path> + +  + + <target name="init" description="Initialize the build"> +  + <tstamp> + <format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/> + </tstamp> + <echo message="Build ${Name}-${version} (${subversion})"/> + <mkdir dir="${classes.dir}"/> + <mkdir dir="${testclasses.dir}"/> + <copy todir="${classes.dir}"> + <fileset dir="${src.dir}"> + <patternset refid="support.files"/> + </fileset> + </copy> + + <copy todir="${build.dir}"> + <fileset dir="."> + <include name="readme.txt"/> + <include name="lgpl.txt"/> + </fileset> + </copy> + +  + <available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/> + </target> + + <target name="compiletest" depends="get.jpa-api,compile" description="Compile the tests"> + <available + classname="org.eclipse.core.launcher.Main" + property="build.compiler" + value="org.eclipse.jdt.core.JDTCompilerAdapter" + classpath="${java.class.path}"/> + <javac + target="${javac.target}" + source="${javac.source}" + destdir="${testclasses.dir}" + classpathref="junit.classpath" + debug="${javac.debug}" + optimize="${javac.optimize}" + nowarn="on"> + <src refid="testsrc.path"/> + </javac> + </target> + + <target name="get.jpa-api" depends="init" unless="jpa-api.jar.available"> + <ant inheritall="false" dir="${basedir}/../ejb-api" target="clean"/> + <ant inheritall="false" dir="${basedir}/../ejb-api" target="jar"/> + </target> + + <target name="jar" depends="compile" description="Build the distribution .jar file"> + <mkdir dir="${classes.dir}/META-INF"/> + <manifest file="${classes.dir}/META-INF/MANIFEST.MF"> + <attribute name="Product" value="${Name}"/> + <attribute name="Version" value="${version}"/> + </manifest> + <antcall target="common-build.jar"/> + </target> + +  + <target name="dist" depends="jar,javadoc,copysource,copytest,copylib,extras" description="Build everything"> + + <copy todir="${dist.dir}" failonerror="false"> + <fileset dir="${common.dir}"> + <include name="common-build.xml"/> + </fileset> + </copy> + <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false"> + </copy> + <antcall target="common-build.dist"/> + </target> + + <target name="zip-dist" description="zip the dist"> + <zip zipfile="${dist.dir}-${version}.zip"> + <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> + </zip> + <tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz"> + <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/> + </tar> + </target> + + +</project> Added: branches/HAN_SPLIT/HibernateExt/commons-annotations/changelog.txt =================================================================== --- branches/HAN_SPLIT/HibernateExt/commons-annotations/changelog.txt (rev 0) +++ branches/HAN_SPLIT/HibernateExt/commons-annotations/changelog.txt 2007-02-01 23:11:49 UTC (rev 11137) @@ -0,0 +1,7 @@ +Hibernate Annotations Changelog +=============================== + +3.2.2.GA (xx-02-2007) +--------------------- + +Initial release as a standalone product (see Hibernate Annotations changelog for previous informations) \ No newline at end of file Added: branches/HAN_SPLIT/HibernateExt/commons-annotations/lgpl.txt =================================================================== --- branches/HAN_SPLIT/HibernateExt/commons-annotations/lgpl.txt (rev 0) +++ branches/HAN_SPLIT/HibernateExt/commons-annotations/lgpl.txt 2007-02-01 23:11:49 UTC (rev 11137) @@ -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! + + Added: branches/HAN_SPLIT/HibernateExt/commons-annotations/lib/README.txt =================================================================== --- branches/HAN_SPLIT/HibernateExt/commons-annotations/lib/README.txt (rev 0) +++ branches/HAN_SPLIT/HibernateExt/commons-annotations/lib/README.txt 2007-02-01 23:11:49 UTC (rev 11137) @@ -0,0 +1,11 @@ +Hibernate Commons Annotations dependencies +========================================== + +Core +==== +commons-logging.jar (see Hibernate Core version): required +log4j.jar (see Hibernate Core version): optional + +Test +==== +ejb3-persistence.jar (final release version): required \ No newline at end of file Added: branches/HAN_SPLIT/HibernateExt/commons-annotations/readme.txt =================================================================== --- branches/HAN_SPLIT/HibernateExt/commons-annotations/readme.txt (rev 0) +++ branches/HAN_SPLIT/HibernateExt/commons-annotations/readme.txt 2007-02-01 23:11:49 UTC (rev 11137) @@ -0,0 +1,45 @@ +Hibernate Commons Annotations +================================================== +Version: 3.2.2.GA, xx.02.2007 + +Description +----------- + +Hibernate Commons Annotations is a utility project used by annotations based +Hibernate sub-projects. +It's first scope is to support Java Generics type discovery. +It's second scope is to support Java Annotations overriding through XML files +(mainly but not conceptually limited to) + + +Instructions +------------ + +TODO: Do something here + + +Contact +------------ + +Latest Documentation: + +This project has no documentation per se, because of it's internal use focus. +Please ask questions to the technical support forum. + +Bug Reports: + + Hibernate JIRA (preferred) + hibernate-devel(a)lists.sourceforge.net + +Free Technical Support: + + http://forum.hibernate.org (http://forum.hibernate.org/viewforum.php?f=9) + + +Notes +----------- + +If you want to contribute, go to http://www.hibernate.org/ + +This software and its documentation are distributed under the terms of the +FSF Lesser Gnu Public License (see lgpl.txt). \ No newline at end of file

17 years, 2 months

1
0
0 / 0

Hibernate SVN: r11136 - branches/HAN_SPLIT/HibernateExt/common.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-02-01 17:51:39 -0500 (Thu, 01 Feb 2007) New Revision: 11136 Modified: branches/HAN_SPLIT/HibernateExt/common/common-build.xml Log: improve common build with ability to override source target and lib modules in inherited builds Modified: branches/HAN_SPLIT/HibernateExt/common/common-build.xml =================================================================== --- branches/HAN_SPLIT/HibernateExt/common/common-build.xml 2007-02-01 22:44:18 UTC (rev 11135) +++ branches/HAN_SPLIT/HibernateExt/common/common-build.xml 2007-02-01 22:51:39 UTC (rev 11136) @@ -36,9 +36,11 @@ <property name="javadoc" value="http://java.sun.com/j2se/1.4/docs/api"/> <property name="javac.debug" value="on"/> <property name="javac.optimize" value="off"/> + <property name="javac.source" value="1.4"/> + <property name="javac.target" value="1.4"/> -  +  <property name="hibernate-core.home" location="${common-build.basedir}/../../hibernate-3.2"/> <property name="hibernate-core.jar" location="${hibernate-core.home}/hibernate3.jar"/> <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib"/> @@ -48,7 +50,16 @@   + <path id="lib.moduleclass.path"/> + + <patternset id="support.files"> <include name="**/*.jpg"/> <include name="**/*.gif"/> <include name="**/*.dtd"/> @@ -193,8 +208,8 @@ value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/> <javac - target="1.4" - source="1.4" + target="${javac.target}" + source="${javac.source}" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="lib.class.path" @@ -211,8 +226,8 @@ value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/> <javac - target="1.4" - source="1.4" + target="${javac.target}" + source="${javac.source}" destdir="${testclasses.dir}" classpathref="junit.classpath" debug="${javac.debug}" @@ -386,7 +401,18 @@ </junit> </target> - <target name="junitinstrument" depends="compiletest,instrument" +  + <target name="junitsingle" depends="compiletest" description="Run a single test suite (requires testname and jdbc.driver properties)"> + <mkdir dir="test_output"/> + <junit printsummary="yes" fork="yes" haltonfailure="yes"> + <classpath refid="junit.classpath"/> + <formatter type="plain"/> + <formatter type="xml"/> + <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/> + </junit> + </target> + + <target name="junitinstrument" depends="compiletest,instrument" description="Run the instrument test suite (requires driver.jar property)"> <mkdir dir="${instrumenttest.out.dir}"/> <junit printsummary="yes" haltonfailure="yes" dir="${basedir}"

17 years, 2 months

1
0
0 / 0

Hibernate SVN: r11135 - in branches/HAN_SPLIT/HibernateExt: metadata/src/test/org/hibernate/annotations and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-02-01 17:44:18 -0500 (Thu, 01 Feb 2007) New Revision: 11135 Added: branches/HAN_SPLIT/HibernateExt/commons-annotations/src/test/org/hibernate/annotations/common/ Removed: branches/HAN_SPLIT/HibernateExt/metadata/src/test/org/hibernate/annotations/common/ Log: Move test common to commons-annotations Copied: branches/HAN_SPLIT/HibernateExt/commons-annotations/src/test/org/hibernate/annotations/common (from rev 11134, branches/HAN_SPLIT/HibernateExt/metadata/src/test/org/hibernate/annotations/common)

17 years, 2 months

1
0
0 / 0

Hibernate SVN: r11134 - in branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common: reflection/java and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-02-01 17:42:22 -0500 (Thu, 01 Feb 2007) New Revision: 11134 Added: branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/AssertionFailure.java branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/util/ branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/util/ReflectHelper.java branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/util/StringHelper.java Modified: branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java Log: Finish commons src independence Added: branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/AssertionFailure.java =================================================================== --- branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/AssertionFailure.java (rev 0) +++ branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/AssertionFailure.java 2007-02-01 22:42:22 UTC (rev 11134) @@ -0,0 +1,30 @@ +//$Id: $ +package org.hibernate.annotations.common; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Indicates failure of an assertion: a possible bug in Hibernate. + * + * @author Gavin King + * @auhor Emmanuel Bernard + */ +//TODO Copy from Hibernate Core, do some mutualization here? +public class AssertionFailure extends RuntimeException { + + private static final Log log = LogFactory.getLog(AssertionFailure.class); + + private static final String MESSAGE = "an assertion failure occured (this may indicate a bug in Hibernate)"; + + public AssertionFailure(String s) { + super(s); + log.error(MESSAGE, this); + } + + public AssertionFailure(String s, Throwable t) { + super(s, t); + log.error(MESSAGE, t); + } + +} Modified: branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java =================================================================== --- branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java 2007-02-01 21:48:09 UTC (rev 11133) +++ branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java 2007-02-01 22:42:22 UTC (rev 11134) @@ -19,7 +19,7 @@ import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironmentFactory; import org.hibernate.annotations.common.reflection.java.generics.TypeSwitch; import org.hibernate.annotations.common.reflection.java.generics.TypeUtils; -import org.hibernate.util.ReflectHelper; +import org.hibernate.annotations.common.util.ReflectHelper; /** * The factory for all the objects in this package. Added: branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/util/ReflectHelper.java =================================================================== --- branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/util/ReflectHelper.java (rev 0) +++ branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/util/ReflectHelper.java 2007-02-01 22:42:22 UTC (rev 11134) @@ -0,0 +1,122 @@ +//$Id: $ +package org.hibernate.annotations.common.util; + +import java.lang.reflect.Method; +import java.lang.reflect.Member; +import java.lang.reflect.Modifier; + +import org.hibernate.annotations.common.AssertionFailure; + +/** + * @author Emmanuel Bernard + */ + +public final class ReflectHelper { + + private static final Class[] OBJECT = new Class[] { Object.class }; + private static final Method OBJECT_EQUALS; + private static final Class[] NO_PARAM = new Class[] { }; + + private static final Method OBJECT_HASHCODE; + static { + Method eq; + Method hash; + try { + eq = Object.class.getMethod("equals", OBJECT); + hash = Object.class.getMethod("hashCode", NO_PARAM); + } + catch (Exception e) { + throw new AssertionFailure("Could not find Object.equals() or Object.hashCode()", e); + } + OBJECT_EQUALS = eq; + OBJECT_HASHCODE = hash; + } + + public static boolean overridesEquals(Class clazz) { + Method equals; + try { + equals = clazz.getMethod("equals", OBJECT); + } + catch (NoSuchMethodException nsme) { + return false; //its an interface so we can't really tell anything... + } + return !OBJECT_EQUALS.equals(equals); + } + + public static boolean overridesHashCode(Class clazz) { + Method hashCode; + try { + hashCode = clazz.getMethod("hashCode", NO_PARAM); + } + catch (NoSuchMethodException nsme) { + return false; //its an interface so we can't really tell anything... + } + return !OBJECT_HASHCODE.equals(hashCode); + } + + public static Class classForName(String name) throws ClassNotFoundException { + try { + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + if ( contextClassLoader != null ) { + return contextClassLoader.loadClass(name); + } + } + catch ( Throwable t ) { + } + return Class.forName( name ); + } + + public static Class classForName(String name, Class caller) throws ClassNotFoundException { + try { + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + if ( contextClassLoader != null ) { + return contextClassLoader.loadClass( name ); + } + } + catch ( Throwable e ) { + } + return Class.forName( name, true, caller.getClassLoader() ); + } + + public static boolean isPublic(Class clazz, Member member) { + return Modifier.isPublic( member.getModifiers() ) && Modifier.isPublic( clazz.getModifiers() ); + } + + public static Object getConstantValue(String name) { + Class clazz; + try { + clazz = classForName( StringHelper.qualifier( name ) ); + } + catch ( Throwable t ) { + return null; + } + try { + return clazz.getField( StringHelper.unqualify( name ) ).get(null); + } + catch ( Throwable t ) { + return null; + } + } + + public static boolean isAbstractClass(Class clazz) { + int modifier = clazz.getModifiers(); + return Modifier.isAbstract(modifier) || Modifier.isInterface(modifier); + } + + public static boolean isFinalClass(Class clazz) { + return Modifier.isFinal( clazz.getModifiers() ); + } + + public static Method getMethod(Class clazz, Method method) { + try { + return clazz.getMethod( method.getName(), method.getParameterTypes() ); + } + catch (Exception e) { + return null; + } + } + + private ReflectHelper() {} + +} + Added: branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/util/StringHelper.java =================================================================== --- branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/util/StringHelper.java (rev 0) +++ branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/util/StringHelper.java 2007-02-01 22:42:22 UTC (rev 11134) @@ -0,0 +1,409 @@ +//$Id: $ +package org.hibernate.annotations.common.util; + +import java.util.Iterator; +import java.util.StringTokenizer; +import java.util.ArrayList; +import java.util.Collection; + +/** + * @author Emmanuel Bernard + */ +//TODO copy from Hibernate Core, mutualization? +public final class StringHelper { + + private static final int ALIAS_TRUNCATE_LENGTH = 10; + public static final String WHITESPACE = " \n\r\f\t"; + + private StringHelper() { /* static methods only - hide constructor */ + } + + /*public static boolean containsDigits(String string) { + for ( int i=0; i<string.length(); i++ ) { + if ( Character.isDigit( string.charAt(i) ) ) return true; + } + return false; + }*/ + + public static int lastIndexOfLetter(String string) { + for ( int i=0; i<string.length(); i++ ) { + char character = string.charAt(i); + if ( !Character.isLetter(character) /*&& !('_'==character)*/ ) return i-1; + } + return string.length()-1; + } + + public static String join(String seperator, String[] strings) { + int length = strings.length; + if ( length == 0 ) return ""; + StringBuffer buf = new StringBuffer( length * strings[0].length() ) + .append( strings[0] ); + for ( int i = 1; i < length; i++ ) { + buf.append( seperator ).append( strings[i] ); + } + return buf.toString(); + } + + public static String join(String seperator, Iterator objects) { + StringBuffer buf = new StringBuffer(); + if ( objects.hasNext() ) buf.append( objects.next() ); + while ( objects.hasNext() ) { + buf.append( seperator ).append( objects.next() ); + } + return buf.toString(); + } + + public static String[] add(String[] x, String sep, String[] y) { + String[] result = new String[x.length]; + for ( int i = 0; i < x.length; i++ ) { + result[i] = x[i] + sep + y[i]; + } + return result; + } + + public static String repeat(String string, int times) { + StringBuffer buf = new StringBuffer( string.length() * times ); + for ( int i = 0; i < times; i++ ) buf.append( string ); + return buf.toString(); + } + + + public static String replace(String template, String placeholder, String replacement) { + return replace( template, placeholder, replacement, false ); + } + + public static String[] replace(String templates[], String placeholder, String replacement) { + String[] result = new String[templates.length]; + for ( int i =0; i<templates.length; i++ ) { + result[i] = replace( templates[i], placeholder, replacement );; + } + return result; + } + + public static String replace(String template, String placeholder, String replacement, boolean wholeWords) { + int loc = template == null ? -1 : template.indexOf( placeholder ); + if ( loc < 0 ) { + return template; + } + else { + final boolean actuallyReplace = !wholeWords || + loc + placeholder.length() == template.length() || + !Character.isJavaIdentifierPart( template.charAt( loc + placeholder.length() ) ); + String actualReplacement = actuallyReplace ? replacement : placeholder; + return new StringBuffer( template.substring( 0, loc ) ) + .append( actualReplacement ) + .append( replace( template.substring( loc + placeholder.length() ), + placeholder, + replacement, + wholeWords ) ).toString(); + } + } + + + public static String replaceOnce(String template, String placeholder, String replacement) { + int loc = template == null ? -1 : template.indexOf( placeholder ); + if ( loc < 0 ) { + return template; + } + else { + return new StringBuffer( template.substring( 0, loc ) ) + .append( replacement ) + .append( template.substring( loc + placeholder.length() ) ) + .toString(); + } + } + + + public static String[] split(String seperators, String list) { + return split( seperators, list, false ); + } + + public static String[] split(String seperators, String list, boolean include) { + StringTokenizer tokens = new StringTokenizer( list, seperators, include ); + String[] result = new String[ tokens.countTokens() ]; + int i = 0; + while ( tokens.hasMoreTokens() ) { + result[i++] = tokens.nextToken(); + } + return result; + } + + public static String unqualify(String qualifiedName) { + int loc = qualifiedName.lastIndexOf("."); + return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( qualifiedName.lastIndexOf(".") + 1 ); + } + + public static String qualifier(String qualifiedName) { + int loc = qualifiedName.lastIndexOf("."); + return ( loc < 0 ) ? "" : qualifiedName.substring( 0, loc ); + } + + public static String[] suffix(String[] columns, String suffix) { + if ( suffix == null ) return columns; + String[] qualified = new String[columns.length]; + for ( int i = 0; i < columns.length; i++ ) { + qualified[i] = suffix( columns[i], suffix ); + } + return qualified; + } + + private static String suffix(String name, String suffix) { + return ( suffix == null ) ? name : name + suffix; + } + + public static String root(String qualifiedName) { + int loc = qualifiedName.indexOf( "." ); + return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( 0, loc ); + } + + public static String unroot(String qualifiedName) { + int loc = qualifiedName.indexOf( "." ); + return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( loc+1, qualifiedName.length() ); + } + + public static boolean booleanValue(String tfString) { + String trimmed = tfString.trim().toLowerCase(); + return trimmed.equals( "true" ) || trimmed.equals( "t" ); + } + + public static String toString(Object[] array) { + int len = array.length; + if ( len == 0 ) return ""; + StringBuffer buf = new StringBuffer( len * 12 ); + for ( int i = 0; i < len - 1; i++ ) { + buf.append( array[i] ).append(", "); + } + return buf.append( array[len - 1] ).toString(); + } + + public static String[] multiply(String string, Iterator placeholders, Iterator replacements) { + String[] result = new String[]{string}; + while ( placeholders.hasNext() ) { + result = multiply( result, ( String ) placeholders.next(), ( String[] ) replacements.next() ); + } + return result; + } + + private static String[] multiply(String[] strings, String placeholder, String[] replacements) { + String[] results = new String[replacements.length * strings.length]; + int n = 0; + for ( int i = 0; i < replacements.length; i++ ) { + for ( int j = 0; j < strings.length; j++ ) { + results[n++] = replaceOnce( strings[j], placeholder, replacements[i] ); + } + } + return results; + } + + public static int countUnquoted(String string, char character) { + if ( '\'' == character ) { + throw new IllegalArgumentException( "Unquoted count of quotes is invalid" ); + } + if (string == null) + return 0; + // Impl note: takes advantage of the fact that an escpaed single quote + // embedded within a quote-block can really be handled as two seperate + // quote-blocks for the purposes of this method... + int count = 0; + int stringLength = string.length(); + boolean inQuote = false; + for ( int indx = 0; indx < stringLength; indx++ ) { + char c = string.charAt( indx ); + if ( inQuote ) { + if ( '\'' == c ) { + inQuote = false; + } + } + else if ( '\'' == c ) { + inQuote = true; + } + else if ( c == character ) { + count++; + } + } + return count; + } + + public static int[] locateUnquoted(String string, char character) { + if ( '\'' == character ) { + throw new IllegalArgumentException( "Unquoted count of quotes is invalid" ); + } + if (string == null) { + return new int[0]; + } + + ArrayList locations = new ArrayList( 20 ); + + // Impl note: takes advantage of the fact that an escpaed single quote + // embedded within a quote-block can really be handled as two seperate + // quote-blocks for the purposes of this method... + int stringLength = string.length(); + boolean inQuote = false; + for ( int indx = 0; indx < stringLength; indx++ ) { + char c = string.charAt( indx ); + if ( inQuote ) { + if ( '\'' == c ) { + inQuote = false; + } + } + else if ( '\'' == c ) { + inQuote = true; + } + else if ( c == character ) { + locations.add( new Integer( indx ) ); + } + } + return toIntArray( locations ); + } + + public static boolean isNotEmpty(String string) { + return string != null && string.length() > 0; + } + + public static boolean isEmpty(String string) { + return string == null || string.length() == 0; + } + + public static String qualify(String prefix, String name) { + if ( name == null || prefix == null ) { + throw new NullPointerException(); + } + return new StringBuffer( prefix.length() + name.length() + 1 ) + .append(prefix) + .append('.') + .append(name) + .toString(); + } + + public static String[] qualify(String prefix, String[] names) { + if ( prefix == null ) return names; + int len = names.length; + String[] qualified = new String[len]; + for ( int i = 0; i < len; i++ ) { + qualified[i] = qualify( prefix, names[i] ); + } + return qualified; + } + + public static int firstIndexOfChar(String sqlString, String string, int startindex) { + int matchAt = -1; + for ( int i = 0; i < string.length(); i++ ) { + int curMatch = sqlString.indexOf( string.charAt( i ), startindex ); + if ( curMatch >= 0 ) { + if ( matchAt == -1 ) { // first time we find match! + matchAt = curMatch; + } + else { + matchAt = Math.min( matchAt, curMatch ); + } + } + } + return matchAt; + } + + public static String truncate(String string, int length) { + if ( string.length() <= length ) { + return string; + } + else { + return string.substring( 0, length ); + } + } + + public static String generateAlias(String description) { + return generateAliasRoot(description) + '_'; + } + + /** + * Generate a nice alias for the given class name or collection role + * name and unique integer. Subclasses of Loader do <em>not</em> have + * to use aliases of this form. + * @return an alias of the form <tt>foo1_</tt> + */ + public static String generateAlias(String description, int unique) { + return generateAliasRoot(description) + + Integer.toString(unique) + + '_'; + } + + /** + * Generates a root alias by truncating the "root name" defined by + * the incoming decription and removing/modifying any non-valid + * alias characters. + * + * @param description The root name from which to generate a root alias. + * @return The generated root alias. + */ + private static String generateAliasRoot(String description) { + String result = truncate( unqualifyEntityName(description), ALIAS_TRUNCATE_LENGTH ) + .toLowerCase() + .replace( '/', '_' ) // entityNames may now include slashes for the representations + .replace( '$', '_' ); //classname may be an inner class + result = cleanAlias( result ); + if ( Character.isDigit( result.charAt(result.length()-1) ) ) { + return result + "x"; //ick! + } + else { + return result; + } + } + + /** + * Clean the generated alias by removing any non-alpha characters from the + * beginning. + * + * @param alias The generated alias to be cleaned. + * @return The cleaned alias, stripped of any leading non-alpha characters. + */ + private static String cleanAlias(String alias) { + char[] chars = alias.toCharArray(); + // short cut check... + if ( !Character.isLetter( chars[0] ) ) { + for ( int i = 1; i < chars.length; i++ ) { + // as soon as we encounter our first letter, return the substring + // from that position + if ( Character.isLetter( chars[i] ) ) { + return alias.substring( i ); + } + } + } + return alias; + } + + public static String unqualifyEntityName(String entityName) { + String result = unqualify(entityName); + int slashPos = result.indexOf( '/' ); + if ( slashPos > 0 ) { + result = result.substring( 0, slashPos - 1 ); + } + return result; + } + + public static String toUpperCase(String str) { + return str==null ? null : str.toUpperCase(); + } + + public static String toLowerCase(String str) { + return str==null ? null : str.toLowerCase(); + } + + public static String moveAndToBeginning(String filter) { + if ( filter.trim().length()>0 ){ + filter += " and "; + if ( filter.startsWith(" and ") ) filter = filter.substring(4); + } + return filter; + } + + //TODO Copy from ArrayHelper in Hibernate Core + public static int[] toIntArray(Collection coll) { + Iterator iter = coll.iterator(); + int[] arr = new int[ coll.size() ]; + int i=0; + while( iter.hasNext() ) { + arr[i++] = ( (Integer) iter.next() ).intValue(); + } + return arr; + } + +}

17 years, 2 months

1
0
0 / 0

Hibernate SVN: r11133 - in branches/HAN_SPLIT/HibernateExt: metadata/src/java/org/hibernate/annotations and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-02-01 16:48:09 -0500 (Thu, 01 Feb 2007) New Revision: 11133 Added: branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common/ Removed: branches/HAN_SPLIT/HibernateExt/metadata/src/java/org/hibernate/annotations/common/ Log: Move common to commons-annotations Copied: branches/HAN_SPLIT/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/common (from rev 11132, branches/HAN_SPLIT/HibernateExt/metadata/src/java/org/hibernate/annotations/common)

17 years, 2 months

1
0
0 / 0

Hibernate SVN: r11132 - branches/HAN_SPLIT.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-02-01 16:24:17 -0500 (Thu, 01 Feb 2007) New Revision: 11132 Added: branches/HAN_SPLIT/HibernateExt/ Log: copy 3.2 into HAN_SPLIT Copied: branches/HAN_SPLIT/HibernateExt (from rev 11131, branches/Branch_3_2/HibernateExt)

17 years, 2 months

1
0
0 / 0

Hibernate SVN: r11131 - branches.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-02-01 16:23:02 -0500 (Thu, 01 Feb 2007) New Revision: 11131 Added: branches/HAN_SPLIT/ Log: create branch to test HAN split (too afraid of svn mess))

17 years, 2 months

1
0
0 / 0

Hibernate SVN: r11130 - in branches/Branch_3_2/HibernateExt: commons-annotations and 7 other directories.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-02-01 15:59:38 -0500 (Thu, 01 Feb 2007) New Revision: 11130 Added: branches/Branch_3_2/HibernateExt/commons-annotations/ branches/Branch_3_2/HibernateExt/commons-annotations/src/ branches/Branch_3_2/HibernateExt/commons-annotations/src/java/ branches/Branch_3_2/HibernateExt/commons-annotations/src/java/org/ branches/Branch_3_2/HibernateExt/commons-annotations/src/java/org/hibernate/ branches/Branch_3_2/HibernateExt/commons-annotations/src/java/org/hibernate/annotations/ branches/Branch_3_2/HibernateExt/commons-annotations/src/test/ branches/Branch_3_2/HibernateExt/commons-annotations/src/test/org/ branches/Branch_3_2/HibernateExt/commons-annotations/src/test/org/hibernate/ branches/Branch_3_2/HibernateExt/commons-annotations/src/test/org/hibernate/annotations/ Log: add commons-annotations structure

17 years, 2 months

1
0
0 / 0

Hibernate SVN: r11129 - tags/BEFORE_HAN_SPLIT.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-02-01 15:54:56 -0500 (Thu, 01 Feb 2007) New Revision: 11129 Added: tags/BEFORE_HAN_SPLIT/HibernateExt/ Log: tag 3.2 to before_han_split Copied: tags/BEFORE_HAN_SPLIT/HibernateExt (from rev 11128, branches/Branch_3_2/HibernateExt)

17 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits February 2007