Menu
▾
▴
[Hibernate-commits] Hibernate SVN: r10235 - in trunk/HibernateExt/ejb-api: . etc src/javax/persistence src/javax/persistence/spi
|
From: <hib...@li...> - 2006-08-08 23:09:06
|
Author: epbernard
Date: 2006-08-08 19:08:58 -0400 (Tue, 08 Aug 2006)
New Revision: 10235
Removed:
trunk/HibernateExt/ejb-api/src/javax/persistence/FlushMode.java
Modified:
trunk/HibernateExt/ejb-api/build.xml
trunk/HibernateExt/ejb-api/etc/license.txt
trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverride.java
trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverrides.java
trunk/HibernateExt/ejb-api/src/javax/persistence/AttributeOverride.java
trunk/HibernateExt/ejb-api/src/javax/persistence/AttributeOverrides.java
trunk/HibernateExt/ejb-api/src/javax/persistence/Basic.java
trunk/HibernateExt/ejb-api/src/javax/persistence/CascadeType.java
trunk/HibernateExt/ejb-api/src/javax/persistence/Column.java
trunk/HibernateExt/ejb-api/src/javax/persistence/ColumnResult.java
trunk/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorColumn.java
trunk/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorType.java
trunk/HibernateExt/ejb-api/src/javax/persistence/EmbeddedId.java
trunk/HibernateExt/ejb-api/src/javax/persistence/Entity.java
trunk/HibernateExt/ejb-api/src/javax/persistence/EntityNotFoundException.java
trunk/HibernateExt/ejb-api/src/javax/persistence/EntityResult.java
trunk/HibernateExt/ejb-api/src/javax/persistence/FetchType.java
trunk/HibernateExt/ejb-api/src/javax/persistence/FieldResult.java
trunk/HibernateExt/ejb-api/src/javax/persistence/GenerationType.java
trunk/HibernateExt/ejb-api/src/javax/persistence/Id.java
trunk/HibernateExt/ejb-api/src/javax/persistence/IdClass.java
trunk/HibernateExt/ejb-api/src/javax/persistence/Inheritance.java
trunk/HibernateExt/ejb-api/src/javax/persistence/InheritanceType.java
trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumn.java
trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumns.java
trunk/HibernateExt/ejb-api/src/javax/persistence/JoinTable.java
trunk/HibernateExt/ejb-api/src/javax/persistence/Lob.java
trunk/HibernateExt/ejb-api/src/javax/persistence/ManyToMany.java
trunk/HibernateExt/ejb-api/src/javax/persistence/ManyToOne.java
trunk/HibernateExt/ejb-api/src/javax/persistence/MappedSuperclass.java
trunk/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQueries.java
trunk/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQuery.java
trunk/HibernateExt/ejb-api/src/javax/persistence/NamedQueries.java
trunk/HibernateExt/ejb-api/src/javax/persistence/NamedQuery.java
trunk/HibernateExt/ejb-api/src/javax/persistence/NoResultException.java
trunk/HibernateExt/ejb-api/src/javax/persistence/NonUniqueResultException.java
trunk/HibernateExt/ejb-api/src/javax/persistence/OneToMany.java
trunk/HibernateExt/ejb-api/src/javax/persistence/OneToOne.java
trunk/HibernateExt/ejb-api/src/javax/persistence/OrderBy.java
trunk/HibernateExt/ejb-api/src/javax/persistence/PersistenceContext.java
trunk/HibernateExt/ejb-api/src/javax/persistence/PrimaryKeyJoinColumn.java
trunk/HibernateExt/ejb-api/src/javax/persistence/PrimaryKeyJoinColumns.java
trunk/HibernateExt/ejb-api/src/javax/persistence/SecondaryTable.java
trunk/HibernateExt/ejb-api/src/javax/persistence/SecondaryTables.java
trunk/HibernateExt/ejb-api/src/javax/persistence/SequenceGenerator.java
trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMapping.java
trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMappings.java
trunk/HibernateExt/ejb-api/src/javax/persistence/Table.java
trunk/HibernateExt/ejb-api/src/javax/persistence/TableGenerator.java
trunk/HibernateExt/ejb-api/src/javax/persistence/Temporal.java
trunk/HibernateExt/ejb-api/src/javax/persistence/TemporalType.java
trunk/HibernateExt/ejb-api/src/javax/persistence/TransactionRequiredException.java
trunk/HibernateExt/ejb-api/src/javax/persistence/Transient.java
trunk/HibernateExt/ejb-api/src/javax/persistence/UniqueConstraint.java
trunk/HibernateExt/ejb-api/src/javax/persistence/Version.java
trunk/HibernateExt/ejb-api/src/javax/persistence/spi/ClassTransformer.java
trunk/HibernateExt/ejb-api/src/javax/persistence/spi/PersistenceProvider.java
trunk/HibernateExt/ejb-api/src/javax/persistence/spi/PersistenceUnitInfo.java
trunk/HibernateExt/ejb-api/src/javax/persistence/spi/PersistenceUnitTransactionType.java
Log:
licensing fix
Modified: trunk/HibernateExt/ejb-api/build.xml
===================================================================
--- trunk/HibernateExt/ejb-api/build.xml 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/build.xml 2006-08-08 23:08:58 UTC (rev 10235)
@@ -14,7 +14,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="name" value="ejb3-persistence"/>
- <property name="version" value="public-draft"/>
+ <property name="version" value="3.0 Final Release"/>
<!-- set global properties for this build -->
<property name="src.dir" value="src"/>
Modified: trunk/HibernateExt/ejb-api/etc/license.txt
===================================================================
--- trunk/HibernateExt/ejb-api/etc/license.txt 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/etc/license.txt 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,84 +1,119 @@
-Copyright 2004-2005 Sun Microsystems, Inc.
+Specification: JSR-000220 Enterprise JavaBeans v.3.0 ("Specification")
+Version: 3.0
+Status: Final Release
+Release: 8 May 2006
+Copyright 2006 SUN MICROSYSTEMS, INC.
4150 Network Circle, Santa Clara, California 95054, U.S.A
All rights reserved.
-NOTICE: The Specification is protected by copyright and the information described therein may be protected
-by one or more U.S. patents, foreign patents, or pending applications. Except as provided under
-the following license, no part of the Specification may be reproduced in any form by any means without
-the prior written authorization of Sun Microsystems, Inc. ("Sun") and its licensors, if any. Any use of the
-Specification and the information described therein will be governed by the terms and conditions of this
-Agreement.
-Subject to the terms and conditions of this license, Sun hereby grants you a fully-paid, non-exclusive,
-non-transferable, limited license (without the right to sublicense) under Sun's intellectual property rights
-to review the Specification only for the purposes of evaluation. This license includes the right to discuss
-the Specification (including the right to provide limited excerpts of text to the extent relevant to the
-point[s] under discussion) with other licensees (under this or a substantially similar version of this Agreement)
-of the Specification. Other than this limited license, you acquire no right, title or interest in or to
-the Specification or any other Sun intellectual property, and the Specification may only be used in accordance
-with the license terms set forth herein. This license will expire on the earlier of: (i) two (2) years
-from the date of Release listed above; (ii) the date on which the final version of the Specification is publicly
-released; or (iii) the date on which the Java Specification Request (JSR) to which the Specification
-corresponds is withdrawn. In addition, this license will terminate immediately without notice from Sun
-if you fail to comply with any provision of this license. Upon termination, you must cease use of or destroy
-the Specification.
-TRADEMARKS: No right, title, or interest in or to any trademarks, service marks, or trade names of Sun,
-Sun's licensors, Specification Lead or the Specification Lead's licensors is granted hereunder. Sun, Sun
-Microsystems, the Sun logo, Java, J2SE, J2EE, J2ME, Java Compatible, the Java Compatible Logo, and
-the Java Coffee Cup logo are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S.
-and other countries.
-DISCLAIMER OF WARRANTIES: THE SPECIFICATION IS PROVIDED "AS IS" AND IS EXPERIMENTAL
-AND MAY CONTAIN DEFECTS OR DEFICIENCIES WHICH CANNOT OR WILL
-NOT BE CORRECTED BY SUN. SUN MAKES NO REPRESENTATIONS OR WARRANTIES, EITHER
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT THAT
-THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE OR THAT
-ANY PRACTICE OR IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY
-THIRD PARTY PATENTS, COPYRIGHTS, TRADE SECRETS OR OTHER RIGHTS. This document
-does not represent any commitment to release or implement any portion of the Specification in any product.
-THE SPECIFICATION COULD INCLUDE TECHNICAL INACCURACIES OR TYPOGRAPHICAL
-ERRORS. CHANGES ARE PERIODICALLY ADDED TO THE INFORMATION THEREIN; THESE
-CHANGES WILL BE INCORPORATED INTO NEW VERSIONS OF THE SPECIFICATION, IF
-ANY. SUN MAY MAKE IMPROVEMENTS AND/OR CHANGES TO THE PRODUCT(S) AND/OR
-THE PROGRAM(S) DESCRIBED IN THE SPECIFICATION AT ANY TIME. Any use of such changEnterprise
-JavaBeans 3.0, Early Draft Sun Microsystems, Inc.
-3 6/24/04
-es in the Specification will be governed by the then-current license for the applicable version of the Specification.
-LIMITATION OF LIABILITY: TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT
-WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT
-LIMITATION, LOST REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL,
-INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS
-OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO ANY
-FURNISHING, PRACTICING, MODIFYING OR ANY USE OF THE SPECIFICATION, EVEN IF
-SUN AND/OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-You will hold Sun (and its licensors) harmless from any claims based on your use of the Specification
-for any purposes other than the limited right of evaluation as described above, and from any claims that
-later versions or releases of any Specification furnished to you are incompatible with the Specification
-provided to you under this license.
-RESTRICTED RIGHTS LEGEND: If this Software is being acquired by or on behalf of the U.S. Government
-or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's
-rights in the Specification and accompanying documentation shall be only as set forth in this license; this
-is in accordance with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD) acquisitions)
-and with 48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
-REPORT: You may wish to report any ambiguities, inconsistencies or inaccuracies you may find in connection
-with your evaluation of the Specification ("Feedback"). To the extent that you provide Sun with
-any Feedback, you hereby: (i) agree that such Feedback is provided on a non-proprietary and non-confidential
-basis, and (ii) grant Sun a perpetual, non-exclusive, worldwide, fully paid-up, irrevocable license,
-with the right to sublicense through multiple levels of sublicensees, to incorporate, disclose, and use
-without limitation the Feedback for any purpose related to the Specification and future versions, implementations,
-and test suites thereof.
-GENERAL TERMS: Any action related to this Agreement will be governed by California law and controlling
-U.S. federal law. The U.N. Convention for the International Sale of Goods and the choice of law
-rules of any jurisdiction will not apply.
+LIMITED LICENSE GRANTS
+1. _License for Evaluation Purposes_. Sun hereby grants you a fully-paid, non-exclusive, non-transferable,
+worldwide, limited license (without the right to sublicense), under Suns applicable intellectual
+property rights to view, download, use and reproduce the Specification only for the purpose of internal
+evaluation. This includes (i) developing applications intended to run on an implementation of the Specification,
+provided that such applications do not themselves implement any portion(s) of the Specification,
+and (ii) discussing the Specification with any third party; and (iii) excerpting brief portions of the
+Specification in oral or written communications which discuss the Specification provided that such excerpts
+do not in the aggregate constitute a significant portion of the Specification.
+2. _License for the Distribution of Compliant Implementations_. Sun also grants you a perpetual, nonexclusive,
+non-transferable, worldwide, fully paid-up, royalty free, limited license (without the right to
+sublicense) under any applicable copyrights or, subject to the provisions of subsection 4 below, patent
+rights it may have covering the Specification to create and/or distribute an Independent Implementation
+of the Specification that: (a) fully implements the Specification including all its required interfaces and
+functionality; (b) does not modify, subset, superset or otherwise extend the Licensor Name Space, or include
+any public or protected packages, classes, Java interfaces, fields or methods within the Licensor
+Name Space other than those required/authorized by the Specification or Specifications being implemented;
+and (c) passes the Technology Compatibility Kit (including satisfying the requirements of the
+applicable TCK Users Guide) for such Specification ("Compliant Implementation"). In addition, the
+foregoing license is expressly conditioned on your not acting outside its scope. No license is granted
+hereunder for any other purpose (including, for example, modifying the Specification, other than to the
+extent of your fair use rights, or distributing the Specification to third parties). Also, no right, title, or
+interest in or to any trademarks, service marks, or trade names of Sun or Suns licensors is granted hereunder.
+Java, and Java-related logos, marks and names are trademarks or registered trademarks of Sun Microsystems,
+Inc. in the U.S. and other countries.
+3. _Pass-through Conditions_. You need not include limitations (a)-(c) from the previous paragraph or
+any other particular "pass through" requirements in any license You grant concerning the use of your Independent
+Implementation or products derived from it. However, except with respect to Independent Implementations
+(and products derived from them) that satisfy limitations (a)-(c) from the previous
+paragraph, You may neither: (a) grant or otherwise pass through to your licensees any licenses under
+Suns applicable intellectual property rights; nor (b) authorize your licensees to make any claims concerning
+their implementations compliance with the Specification in question.
+4. _Reciprocity Concerning Patent Licenses_.
+a. With respect to any patent claims covered by the license granted under subparagraph 2 above that
+would be infringed by all technically feasible implementations of the Specification, such license is conditioned
+upon your offering on fair, reasonable and non-discriminatory terms, to any party seeking it
+from You, a perpetual, non-exclusive, non-transferable, worldwide license under Your patent rights
+which are or would be infringed by all technically feasible implementations of the Specification to develop,
+distribute and use a Compliant Implementation.
+b With respect to any patent claims owned by Sun and covered by the license granted under subparagraph
+2, whether or not their infringement can be avoided in a technically feasible manner when implementing
+the Specification, such license shall terminate with respect to such claims if You initiate a claim against
+Sun that it has, in the course of performing its responsibilities as the Specification Lead, induced any other
+entity to infringe Your patent rights.
+c Also with respect to any patent claims owned by Sun and covered by the license granted under subparagraph
+2 above, where the infringement of such claims can be avoided in a technically feasible manner
+when implementing the Specification such license, with respect to such claims, shall terminate if You
+initiate a claim against Sun that its making, having made, using, offering to sell, selling or importing a
+Compliant Implementation infringes Your patent rights.
+5. _Definitions_. For the purposes of this Agreement: "Independent Implementation" shall mean an implementation
+of the Specification that neither derives from any of Suns source code or binary code materials
+nor, except with an appropriate and separate license from Sun, includes any of Suns source code
+or binary code materials; "Licensor Name Space" shall mean the public class or interface declarations
+whose names begin with "java", "javax", "com.sun" or their equivalents in any subsequent naming convention
+adopted by Sun through the Java Community Process, or any recognized successors or replacements
+thereof; and "Technology Compatibility Kit" or "TCK" shall mean the test suite and
+accompanying TCK Users Guide provided by Sun which corresponds to the Specification and that was
+available either (i) from Sun 120 days before the first release of Your Independent Implementation that
+allows its use for commercial purposes, or (ii) more recently than 120 days from such release but against
+which You elect to test Your implementation of the Specification.
+This Agreement will terminate immediately without notice from Sun if you breach the Agreement or act
+outside the scope of the licenses granted above.
+DISCLAIMER OF WARRANTIES
+THE SPECIFICATION IS PROVIDED "AS IS". SUN MAKES NO REPRESENTATIONS OR WARRANTIES,
+EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT
+(INCLUDING AS A CONSEQUENCE OF ANY PRACTICE OR IMPLEMENTATION
+OF THE SPECIFICATION), OR THAT THE CONTENTS OF THE SPECIFICATION ARE
+SUITABLE FOR ANY PURPOSE. This document does not represent any commitment to release or implement
+any portion of the Specification in any product. In addition, the Specification could include technical
+inaccuracies or typographical errors.
+LIMITATION OF LIABILITY
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS
+BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION, LOST REVENUE,
+PROFITS OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ARISING OUT OF OR RELATED IN ANY WAY TO YOUR HAVING, IMPLEMENTING OR
+OTHERWISE USING THE SPECIFICATION, EVEN IF SUN AND/OR ITS LICENSORS HAVE
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+You will indemnify, hold harmless, and defend Sun and its licensors from any claims arising or resulting
+from: (i) your use of the Specification; (ii) the use or distribution of your Java application, applet and/or
+implementation; and/or (iii) any claims that later versions or releases of any Specification furnished to
+you are incompatible with the Specification provided to you under this license.
+
+RESTRICTED RIGHTS LEGEND
+U.S. Government: If this Specification is being acquired by or on behalf of the U.S. Government or by a
+U.S. Government prime contractor or subcontractor (at any tier), then the Governments rights in the
+Software and accompanying documentation shall be only as set forth in this license; this is in accordance
+with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD) acquisitions) and with
+48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
+REPORT
+If you provide Sun with any comments or suggestions concerning the Specification ("Feedback"), you
+hereby: (i) agree that such Feedback is provided on a non-proprietary and non-confidential basis, and (ii)
+grant Sun a perpetual, non-exclusive, worldwide, fully paid-up, irrevocable license, with the right to sublicense
+through multiple levels of sublicensees, to incorporate, disclose, and use without limitation the
+Feedback for any purpose.
+GENERAL TERMS
+Any action related to this Agreement will be governed by California law and controlling U.S. federal law.
+The U.N. Convention for the International Sale of Goods and the choice of law rules of any jurisdiction
+will not apply.
The Specification is subject to U.S. export control laws and may be subject to export or import regulations
in other countries. Licensee agrees to comply strictly with all such laws and regulations and acknowledges
that it has the responsibility to obtain such licenses to export, re-export or import as may be
required after delivery to Licensee.
-Neither party may assign or otherwise transfer any of its rights or obligations under this Agreement, without
-the prior written consent of the other party, except that Sun may assign this Agreement to an affiliated
-company.
-This Agreement is the parties' entire agreement relating to its subject matter. It supersedes all prior or
+This Agreement is the parties entire agreement relating to its subject matter. It supersedes all prior or
contemporaneous oral or written communications, proposals, conditions, representations and warranties
and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication
between the parties relating to its subject matter during the term of this Agreement. No modification
to this Agreement will be binding, unless in writing and signed by an authorized representative
of each party.
-(Sun.pSpec.license.11.14.2003)
\ No newline at end of file
+Rev. April, 2006
+Sun/Final/Full
\ No newline at end of file
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverride.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverride.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverride.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,4 +1,5 @@
-//$Id: $
+//$Id:$
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Target;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverrides.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverrides.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverrides.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,4 +1,5 @@
-//$Id: $
+//$Id:$
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Target;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/AttributeOverride.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/AttributeOverride.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/AttributeOverride.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/AttributeOverrides.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/AttributeOverrides.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/AttributeOverrides.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/Basic.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/Basic.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/Basic.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import static java.lang.annotation.ElementType.FIELD;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/CascadeType.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/CascadeType.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/CascadeType.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
/**
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/Column.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/Column.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/Column.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/ColumnResult.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/ColumnResult.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/ColumnResult.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Target;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorColumn.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorColumn.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorColumn.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorType.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorType.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorType.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
/**
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/EmbeddedId.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/EmbeddedId.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/EmbeddedId.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.ElementType;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/Entity.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/Entity.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/Entity.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import static java.lang.annotation.ElementType.TYPE;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/EntityNotFoundException.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/EntityNotFoundException.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/EntityNotFoundException.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -10,16 +10,8 @@
super();
}
- public EntityNotFoundException(String message, Throwable cause) {
- super( message, cause );
- }
-
public EntityNotFoundException(String message) {
super( message );
}
- public EntityNotFoundException(Throwable cause) {
- super( cause );
- }
-
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/EntityResult.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/EntityResult.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/EntityResult.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Target;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/FetchType.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/FetchType.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/FetchType.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
/**
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/FieldResult.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/FieldResult.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/FieldResult.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Deleted: trunk/HibernateExt/ejb-api/src/javax/persistence/FlushMode.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/FlushMode.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/FlushMode.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,24 +0,0 @@
-/*
- * JBoss, the OpenSource EJB server
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package javax.persistence;
-
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision$
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface FlushMode {
- FlushModeType value() default FlushModeType.AUTO;
-}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/GenerationType.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/GenerationType.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/GenerationType.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
/**
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/Id.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/Id.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/Id.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import static java.lang.annotation.ElementType.FIELD;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/IdClass.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/IdClass.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/IdClass.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/Inheritance.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/Inheritance.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/Inheritance.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import static java.lang.annotation.ElementType.TYPE;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/InheritanceType.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/InheritanceType.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/InheritanceType.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
/**
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumn.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumn.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumn.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
@@ -9,16 +9,59 @@
import static java.lang.annotation.RetentionPolicy.*;
/**
+ * Is used to specify a mapped column for joining an entity association.
+ *
* @author Emmanuel Bernard
*/
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
+@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
public @interface JoinColumn {
+ /**
+ * The name of the foreign key column.
+ * The table in which it is found depends upon the context. If the join is for a OneToOne
+ * or Many- ToOne mapping, the foreign key column is in the table of the source entity.
+ * If the join is for a ManyToMany, the foreign key is in a join table. Default (only applies
+ * if a single join column is used): The concatenation of the following: the name of the referencing
+ * relationship property or field of the referencing entity; "_"; the name of the referenced primary
+ * key column. If there is no such referencing relationship property or field in the entity, the join
+ * column name is formed as the concatenation of the following: the name of the entity; "_"; the name
+ * of the referenced primary key column.
+ */
String name() default "";
+ /**
+ * The name of the column referenced by this foreign key column. When used with relationship mappings,
+ * the referenced column is in the table of the target entity. When used inside a JoinTable annotation,
+ * the referenced key column is in the entity table of the owning entity, or inverse entity if the join
+ * is part of the inverse join definition. Default (only applies if single join column is being used):
+ * The same name as the primary key column of the referenced table.
+ */
String referencedColumnName() default "";
+ /**
+ * Whether the property is a unique key. This is a shortcut for the UniqueConstraint annotation at the
+ * table level and is useful for when the unique key constraint is only a single field. It is not
+ * necessary to explicitly specify this for a join column that corresponds to a primary key that is part
+ * of a foreign key.
+ */
boolean unique() default false;
+ /**
+ * Whether the foreign key column is nullable
+ */
boolean nullable() default true;
+ /**
+ * Whether the column is included in SQL INSERT statements generated by the persistence provider
+ */
boolean insertable() default true;
+ /**
+ * Whether the column is included in SQL UPDATE statements generated by the persistence provider
+ */
boolean updatable() default true;
+ /**
+ * The SQL fragment that is used when generating the DDL for the column.
+ * Defaults to the generated SQL for the column.
+ */
String columnDefinition() default "";
+ /**
+ * The name of the table that contains the column. If a table is not specified, the column is
+ * assumed to be in the primary table of the applicable entity
+ */
String table() default "";
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumns.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumns.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumns.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
@@ -9,9 +9,15 @@
import static java.lang.annotation.RetentionPolicy.*;
/**
+ * Defines mapping for the composite foreign keys.
+ * This annotation groups JoinColumn annotations for the same relationship.
+ *
+ * When the JoinColumns annotation is used, both the name and the referencedColumnName
+ * elements must be specified in each such JoinColumn annotation.
+
* @author Emmanuel Bernard
*/
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
+@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
public @interface JoinColumns {
- JoinColumn[] value() default {};
+ JoinColumn[] value();
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/JoinTable.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/JoinTable.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/JoinTable.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/Lob.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/Lob.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/Lob.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import static java.lang.annotation.ElementType.METHOD;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/ManyToMany.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/ManyToMany.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/ManyToMany.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/ManyToOne.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/ManyToOne.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/ManyToOne.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/MappedSuperclass.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/MappedSuperclass.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/MappedSuperclass.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQueries.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQueries.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQueries.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,17 +1,21 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
-import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
+ * Is used to specify an array of native SQL named queries. Query names are scoped to the persistence unit
+ *
* @author Emmanuel Bernard
*/
-@Target({TYPE, PACKAGE}) @Retention(RUNTIME)
+@Target({TYPE}) @Retention(RUNTIME)
public @interface NamedNativeQueries {
+ /**
+ * Array of native SQL named queries
+ */
NamedNativeQuery [] value ();
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQuery.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQuery.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQuery.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import static java.lang.annotation.ElementType.*;
@@ -8,19 +8,32 @@
import java.lang.annotation.Target;
/**
+ * Is used to specify a native SQL named query. Query names are scoped to the persistence unit.
+ *
* @author Emmanuel Bernard
*/
-//TODO remove the package target
-@Target({TYPE, PACKAGE})
+@Target({TYPE})
@Retention(RUNTIME)
public @interface NamedNativeQuery {
+ /**
+ * Is used to refer to the query when using the EntityManager methods that create query objects
+ */
String name();
-
+ /**
+ * The SQL query string
+ */
String query();
+ /**
+ * Vendor-specific query hints
+ */
QueryHint[] hints() default {};
-
+ /**
+ * The class of the result
+ */
Class resultClass() default void.class;
-
+ /**
+ * The name of a SqlResultSetMapping, as defined in metadata
+ */
String resultSetMapping() default ""; // name of SQLResultSetMapping
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/NamedQueries.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/NamedQueries.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/NamedQueries.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,18 +1,21 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
-import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
+ * Specifies an array of named Java Persistence query language queries. Query names are scoped to the persistence unit.
+ *
* @author Emmanuel Bernard
*/
-//TODO remove PACKAGE target
-@Target({TYPE, PACKAGE}) @Retention(RUNTIME)
+@Target({TYPE}) @Retention(RUNTIME)
public @interface NamedQueries {
+ /**
+ * An array of named Java Persistence query language queries.
+ */
NamedQuery [] value ();
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/NamedQuery.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/NamedQuery.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/NamedQuery.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
@@ -8,12 +8,24 @@
import static java.lang.annotation.ElementType.*;
/**
+ * Is used to specify a named query in the Java Persistence query language, which is a static
+ * query expressed in metadata. Query names are scoped to the persistence unit.
+ *
* @author Emmanuel Bernard
*/
//TODO remove the mackage target
-@Target({TYPE, PACKAGE}) @Retention(RUNTIME)
+@Target({TYPE}) @Retention(RUNTIME)
public @interface NamedQuery {
+ /**
+ * Refers to the query when using the EntityManager methods that create query objects.
+ */
String name();
+ /**
+ * The query string in the Java Persistence query language
+ */
String query();
+ /**
+ * Vendor-specific query hints
+ */
QueryHint[] hints() default {};
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/NoResultException.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/NoResultException.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/NoResultException.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -2,25 +2,26 @@
package javax.persistence;
/**
- * Expected an entity result, but none found.
+ * Thrown by the persistence provider when getSingleResult() is executed on a query and there is no result to return.
+ * This exception will not cause the current transaction, if one is active, to be marked for roll back.
*
* @author Emmanuel Bernard
*/
public class NoResultException extends PersistenceException {
+ /**
+ * Constructs a new NoResultException exception with null as its detail message
+ */
public NoResultException() {
super();
}
- public NoResultException(String message, Throwable cause) {
- super( message, cause );
- }
-
+ /**
+ * Constructs a new NoResultException exception with the specified detail message.
+ *
+ * @param message
+ */
public NoResultException(String message) {
super( message );
}
-
- public NoResultException(Throwable cause) {
- super( cause );
- }
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/NonUniqueResultException.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/NonUniqueResultException.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/NonUniqueResultException.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -2,24 +2,28 @@
package javax.persistence;
/**
+ * Thrown by the persistence provider when getSingleResult() is executed on a query and there is more than
+ * one result from the query. This exception will not cause the current transaction, if one is active, to be
+ * marked for roll back.
+ *
* @author Gavin King
*/
public class NonUniqueResultException extends PersistenceException {
+ /**
+ * Constructs a new NonUniqueResultException exception with null as its detail message
+ */
public NonUniqueResultException() {
super();
}
+ /**
+ * Constructs a new NonUniqueResultException exception with the specified detail message
+ *
+ * @param message
+ */
public NonUniqueResultException(String message) {
super( message );
}
- public NonUniqueResultException(String message, Throwable cause) {
- super( message, cause );
- }
-
- public NonUniqueResultException(Throwable cause) {
- super( cause );
- }
-
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/OneToMany.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/OneToMany.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/OneToMany.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/OneToOne.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/OneToOne.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/OneToOne.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/OrderBy.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/OrderBy.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/OrderBy.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/PersistenceContext.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/PersistenceContext.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/PersistenceContext.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -12,16 +12,30 @@
import java.lang.annotation.Target;
/**
- * Comment
+ * Expresses a dependency on an EntityManager persistence context.
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision$
*/
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
-public @interface PersistenceContext
-{
- String name() default "";
- String unitName() default "";
- PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+public @interface PersistenceContext {
+ /**
+ * The name by which the entity manager is to be accessed in the environment referencing context,
+ * and is not needed when dependency injection is used.
+ */
+ String name() default "";
+ /**
+ * The name of the persistence unit. If the unitName element is specified, the persistence unit for the
+ * entity manager that is accessible in JNDI must have the same name.
+ */
+ String unitName() default "";
+ /**
+ * Used to specify properties for the container or persistence provider. Vendor specific properties may be included
+ * in this set of properties. Properties that are not recognized by a vendor are ignored.
+ */
+ PersistenceProperty[] properties() default {};
+ /**
+ * Specifies whether this is a transaction-scoped persistence context or an extended persistence context.
+ */
+ PersistenceContextType type() default PersistenceContextType.TRANSACTION;
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/PrimaryKeyJoinColumn.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/PrimaryKeyJoinColumn.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/PrimaryKeyJoinColumn.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/PrimaryKeyJoinColumns.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/PrimaryKeyJoinColumns.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/PrimaryKeyJoinColumns.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
@@ -9,9 +9,14 @@
import static java.lang.annotation.RetentionPolicy.*;
/**
+ * This annotation groups PrimaryKeyJoinColumn annotations. It is used to map composite foreign keys.
+ *
* @author Emmanuel Bernard
*/
@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
public @interface PrimaryKeyJoinColumns {
- PrimaryKeyJoinColumn[] value() default {};
+ /**
+ * One or more PrimaryKeyJoinColumn annotations
+ */
+ PrimaryKeyJoinColumn[] value();
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/SecondaryTable.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/SecondaryTable.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/SecondaryTable.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/SecondaryTables.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/SecondaryTables.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/SecondaryTables.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
@@ -8,9 +8,14 @@
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
/**
+ * This annotation is used to specify multiple secondary tables for an entity.
+ *
* @author Emmanuel Bernard
*/
@Target({TYPE}) @Retention(RUNTIME)
public @interface SecondaryTables {
- SecondaryTable[] value() default {};
+ /**
+ * The secondary tables for an entity.
+ */
+ SecondaryTable[] value();
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/SequenceGenerator.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/SequenceGenerator.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/SequenceGenerator.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Retention;
@@ -9,13 +9,30 @@
import static java.lang.annotation.RetentionPolicy.*;
/**
+ * This annotation defines a primary key generator that may be referenced by name when a generator
+ * element is specified for the GeneratedValue annotation. A sequence generator may be specified on
+ * the entity class or on the primary key field or property. The scope of the generator name is global
+ * to the persistence unit (across all generator types).
+ *
* @author Emmanuel Bernard
*/
-//TODO remove Package eventually
-@Target({PACKAGE, TYPE, METHOD, FIELD}) @Retention(RUNTIME)
+@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
public @interface SequenceGenerator {
- String name();
- String sequenceName() default "";
- int initialValue() default 1;
- int allocationSize() default 50;
+ /**
+ * A unique generator name that can be referenced by one or more classes to be the generator for primary key values
+ */
+ String name();
+ /**
+ * The name of the database sequence object from which to obtain primary key values
+ * Defaults to a provider-chosen value
+ */
+ String sequenceName() default "";
+ /**
+ * The value from which the sequence object is to start generating
+ */
+ int initialValue() default 1;
+ /**
+ * The amount to increment by when allocating sequence numbers from the sequence
+ */
+ int allocationSize() default 50;
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMapping.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMapping.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMapping.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -1,5 +1,5 @@
//$Id$
-//EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
+//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
package javax.persistence;
import java.lang.annotation.Target;
@@ -8,12 +8,22 @@
import java.lang.annotation.RetentionPolicy;
/**
+ * This annotation is used to specify the mapping of the result of a native SQL query
+ *
* @author Emmanuel Bernard
*/
-//TODO remove the package target
-@Target({ElementType.PACKAGE, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
public @interface SqlResultSetMapping {
+ /**
+ * The name given to the result set mapping, and used to refer to it in the methods of the Query API
+ */
String name();
+ /**
+ * Specifies the result set mapping to entities
+ */
EntityResult[] entities() default {};
+ /**
+ * Specifies the result set mapping to scalar values
+ */
ColumnResult[] columns() default {};
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMappings.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMappings.java 2006-08-08 23:08:29 UTC (rev 10234)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMappings.java 2006-08-08 23:08:58 UTC (rev 10235)
@@ -9,10 +9,11 @@
import java.lang.annotation.RetentionPolicy;
/**
+ * This annotation is used to define one or more SqlResultSetMapping
+ *
* @author Emmanuel Bernard
*/
-//TODO remove Package target
-@Target({ElementType.PACKAGE, ElementType.TYPE}) @Retention...
[truncated message content] |
