diff --git a/src/javax/persistence/Column.java b/src/javax/persistence/Column.java index 163b961a3..9ae01c923 100644 --- a/src/javax/persistence/Column.java +++ b/src/javax/persistence/Column.java @@ -103,17 +103,6 @@ public @interface Column { */ boolean updatable() default true; - /** - * (Optional) The SQL fragment that is used when - * generating the DDL for the column. - *

- * Defaults to the generated SQL to create a - * column of the inferred type. - * - * @return String - */ - String columnDefinition() default ""; - /** * (Optional) The name of the table that contains the column. * If absent the column is assumed to be in the primary table. diff --git a/src/javax/persistence/Table.java b/src/javax/persistence/Table.java index dd39e3784..d25dc26c7 100644 --- a/src/javax/persistence/Table.java +++ b/src/javax/persistence/Table.java @@ -1,4 +1,4 @@ -/******************************************************************************* +/** ***************************************************************************** * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved. * * This program and the accompanying materials are made available under the @@ -12,7 +12,7 @@ * Linda DeMichiel - Java Persistence 2.1 * Linda DeMichiel - Java Persistence 2.0 * - ******************************************************************************/ + ***************************************************************************** */ package javax.persistence; import java.lang.annotation.Target; @@ -22,9 +22,10 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Specifies the primary table for the annotated entity. Additional - * tables may be specified using SecondaryTable or SecondaryTables annotation. + * tables may be specified using SecondaryTable or SecondaryTables annotation. * - *

If no Table annotation is specified for an entity + *

+ * If no Table annotation is specified for an entity * class, the default values apply. * *

@@ -37,27 +38,25 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
  *
  * @since Java Persistence 1.0
  */
-@Target(TYPE) 
+@Target(TYPE)
 @Retention(RUNTIME)
 public @interface Table {
 
     /**
      * (Optional) The name of the table.
-     * 

Defaults to the entity name. + *

+ * Defaults to the entity name. + * * @return String */ String name() default ""; /** (Optional) The catalog of the table. - *

Defaults to the default catalog. + *

+ * Defaults to the default catalog. + * * @return String */ String catalog() default ""; - /** (Optional) The schema of the table. - *

Defaults to the default schema for user. - * @return String - */ - String schema() default ""; - }