Menu
▾
▴
[Hibernate-commits] Hibernate Code SVN: r9572 - in trunk/HibernateExt: ejb-api/src/javax/persistence metadata/src/java/org/hibernate/cfg
|
From: <hib...@li...> - 2006-03-08 01:30:50
|
Author: epbernard
Date: 2006-03-07 20:28:05 -0500 (Tue, 07 Mar 2006)
New Revision: 9572
Added:
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/SqlResultSetMappings.java
Modified:
trunk/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorColumn.java
trunk/HibernateExt/ejb-api/src/javax/persistence/EntityResult.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/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/PostRemove.java
trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMapping.java
trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java
Log:
Update EJB3 API
ANN-275
Added: trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverride.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverride.java 2006-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverride.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -0,0 +1,18 @@
+//$Id: $
+package javax.persistence;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
+public @interface AssociationOverride {
+ String name();
+ JoinColumn[] joinColumns();
+}
Added: trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverrides.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverrides.java 2006-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/AssociationOverrides.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -0,0 +1,17 @@
+//$Id: $
+package javax.persistence;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
+public @interface AssociationOverrides {
+ AssociationOverride[] value();
+}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorColumn.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorColumn.java 2006-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorColumn.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -14,7 +14,7 @@
*/
@Target({TYPE}) @Retention(RUNTIME)
public @interface DiscriminatorColumn {
- String name() default "";
+ String name() default "DTYPE";
DiscriminatorType discriminatorType() default STRING;
String columnDefinition() default "";
int length() default 31;
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/EntityResult.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/EntityResult.java 2006-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/EntityResult.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -11,7 +11,7 @@
*/
@Target({}) @Retention(RetentionPolicy.RUNTIME)
public @interface EntityResult {
- String name();
+ Class entityClass();
+ FieldResult[] fields() default {};
String discriminatorColumn() default "";
- FieldResult[] fields() default {};
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumn.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumn.java 2006-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumn.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -11,7 +11,7 @@
/**
* @author Emmanuel Bernard
*/
-@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
+@Target({METHOD, FIELD}) @Retention(RUNTIME)
public @interface JoinColumn {
String name() default "";
String referencedColumnName() default "";
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumns.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumns.java 2006-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/JoinColumns.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -11,7 +11,7 @@
/**
* @author Emmanuel Bernard
*/
-@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
+@Target({METHOD, FIELD}) @Retention(RUNTIME)
public @interface JoinColumns {
JoinColumn[] value() default {};
}
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQuery.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQuery.java 2006-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQuery.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -10,6 +10,7 @@
/**
* @author Emmanuel Bernard
*/
+//TODO remove the package target
@Target({TYPE, PACKAGE})
@Retention(RUNTIME)
public @interface NamedNativeQuery {
@@ -21,5 +22,5 @@
Class resultClass() default void.class;
- String resultSetMapping() default ""; // name of SQLResultSet Mapping
+ 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-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/NamedQueries.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -11,6 +11,7 @@
/**
* @author Emmanuel Bernard
*/
+//TODO remove PACKAGE target
@Target({TYPE, PACKAGE}) @Retention(RUNTIME)
public @interface NamedQueries {
NamedQuery [] value ();
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/NamedQuery.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/NamedQuery.java 2006-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/NamedQuery.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -10,6 +10,7 @@
/**
* @author Emmanuel Bernard
*/
+//TODO remove the mackage target
@Target({TYPE, PACKAGE}) @Retention(RUNTIME)
public @interface NamedQuery {
String name();
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/PostRemove.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/PostRemove.java 2006-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/PostRemove.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -17,7 +17,7 @@
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
*/
-@Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER})
+@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface PostRemove
{
Modified: trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMapping.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMapping.java 2006-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMapping.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -10,7 +10,7 @@
/**
* @author Emmanuel Bernard
*/
-
+//TODO remove the package target
@Target({ElementType.PACKAGE, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
public @interface SqlResultSetMapping {
String name();
Added: trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMappings.java
===================================================================
--- trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMappings.java 2006-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMappings.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -0,0 +1,18 @@
+//$Id: SqlResultSetMapping.java 9044 2006-01-12 20:58:41 -0500 (jeu., 12 janv. 2006) epbernard $
+//EJB3 Specification Copyright 2004 - 2006 Sun Microsystems, Inc.
+
+package javax.persistence;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @author Emmanuel Bernard
+ */
+//TODO remove Package target
+@Target({ElementType.PACKAGE, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
+public @interface SqlResultSetMappings {
+ SqlResultSetMapping[] value();
+}
Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java 2006-03-08 00:50:19 UTC (rev 9571)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java 2006-03-08 01:28:05 UTC (rev 9572)
@@ -15,7 +15,7 @@
public class Ejb3DiscriminatorColumn extends Ejb3Column {
- private static final String DEFAULT_DISCRIMINATOR_COLUMN_NAME = "TYPE";
+ private static final String DEFAULT_DISCRIMINATOR_COLUMN_NAME = "DTYPE";
private static final String DEFAULT_DISCRIMINATOR_TYPE = "string";
private String discriminatorTypeName;
@@ -43,12 +43,6 @@
Ejb3DiscriminatorColumn discriminatorColumn = new Ejb3DiscriminatorColumn();
discriminatorColumn.setMappings( mappings );
discriminatorColumn.setImplicit( true );
-// String discrSqlType = null;
-// String discrColumnName = DEFAULT_DISCRIMINATOR_COLUMN_NAME;
-// int discrLength = 255;
-// boolean discrNullable = false;
-// String discrTypeName = "string";
-// boolean isImplicit = true;
if ( discFormulaAnn != null ) {
discriminatorColumn.setImplicit( false );
discriminatorColumn.setFormula( discFormulaAnn.value() );
@@ -63,14 +57,6 @@
if ( ! AnnotationBinder.isDefault( discAnn.name() ) ) discriminatorColumn.setLogicalColumnName( discAnn.name() );
discriminatorColumn.setNullable( false );
}
-// boolean overrideDefaultValues = discAnn != null;
-// if (overrideDefaultValues) {
-// isImplicit = false;
-// discrSqlType = "".equals( discAnn.columnDefinition() ) ? null : discAnn.columnDefinition();
-// discrColumnName = "".equals( discAnn.name() ) ? DEFAULT_DISCRIMINATOR_COLUMN_NAME : discAnn.name();
-// discrNullable = discAnn.nullable();
-//
-// }
if ( DiscriminatorType.CHAR.equals( type ) ) {
discriminatorColumn.setDiscriminatorTypeName( "character" );
discriminatorColumn.setImplicit( false );
@@ -82,14 +68,10 @@
else if ( DiscriminatorType.STRING.equals( type ) || type == null ) {
if ( discAnn != null ) discriminatorColumn.setLength( discAnn.length() );
discriminatorColumn.setDiscriminatorTypeName( "string" );
-// discrLength = overrideDefaultValues ? discAnn.length() : discrLength;
-// discrTypeName = "string";
}
else {
throw new AssertionFailure( "Unknown discriminator type: " + type );
}
-// discriminatorColumn = new Ejb3DiscriminatorColumn(isImplicit, discrSqlType, discrLength, discrColumnName, discrNullable,
-// false, false, false, (String) null, null, null, discrTypeName, mappings);
discriminatorColumn.bind();
return discriminatorColumn;
}
|
