You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by cl...@apache.org on 2007/06/27 05:53:40 UTC
svn commit: r551025 - in /db/jdo/trunk: api2/src/java/javax/jdo/annotations/
tck2/ tck20/
Author: clr
Date: Tue Jun 26 20:53:39 2007
New Revision: 551025
URL: http://svn.apache.org/viewvc?view=rev&rev=551025
Log:
Split tck20 into tck2 and tck2-legacy; first step
Added:
db/jdo/trunk/tck2/
- copied from r551023, db/jdo/trunk/tck20/
Removed:
db/jdo/trunk/tck20/
Modified:
db/jdo/trunk/api2/src/java/javax/jdo/annotations/Extension.java
db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchField.java
db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchGroup.java
db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchGroups.java
db/jdo/trunk/api2/src/java/javax/jdo/annotations/Field.java
db/jdo/trunk/api2/src/java/javax/jdo/annotations/Sequence.java
db/jdo/trunk/api2/src/java/javax/jdo/annotations/Table.java
Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/Extension.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/Extension.java?view=diff&rev=551025&r1=551024&r2=551025
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/Extension.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/Extension.java Tue Jun 26 20:53:39 2007
@@ -32,17 +32,17 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface Extension
{
- /** Vendor that the extension applies to.
+ /** Vendor that the extension applies to (required).
* @return the vendor
*/
String vendorName();
- /** The key for the extension.
+ /** The key for the extension (required).
* @return the key
*/
String key();
- /** The value for the extension.
+ /** The value for the extension (required).
* @return the value
*/
String value();
Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchField.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchField.java?view=diff&rev=551025&r1=551024&r2=551025
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchField.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchField.java Tue Jun 26 20:53:39 2007
@@ -27,12 +27,17 @@
* @version 2.1
* @since 2.1
*/
-@Target({ElementType.FIELD, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
public @interface FetchField
{
- /** Name of the field (required). */
+ /** Name of the field (required).
+ * @return the name of the field
+ */
String name();
- /** Recursion depth for this field. */
+ /** Recursion depth for this field.
+ * @return the recursion depth
+ */
int recursionDepth() default 1;
}
Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchGroup.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchGroup.java?view=diff&rev=551025&r1=551024&r2=551025
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchGroup.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchGroup.java Tue Jun 26 20:53:39 2007
@@ -28,18 +28,20 @@
* @version 2.1
* @since 2.1
*/
-@Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
public @interface FetchGroup
{
/**
* Name of the fetch group.
- * @return Name of the fetch group.
+ * @return the name of the fetch group.
*/
String name() default "";
/**
* Whether we should load this group as part of the post load process.
- * @return Whether we should load this group as part of the post load process.
+ * @return Whether we should load this group as part of the post load
+ * process.
*/
String postLoad() default "";
@@ -49,6 +51,7 @@
*/
FetchField[] fields();
- // Annotations are badly designed in that they dont allow nested groups and object about "cycle detection"
- // so we cant have nested fetch groups in annotations
+ // Annotations are badly designed in that they don't allow nested groups
+ // and object to "cycle detection"
+ // so we can't have nested fetch groups in annotations
}
Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchGroups.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchGroups.java?view=diff&rev=551025&r1=551024&r2=551025
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchGroups.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/FetchGroups.java Tue Jun 26 20:53:39 2007
@@ -27,7 +27,8 @@
* @version 2.1
* @since 2.1
*/
-@Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
public @interface FetchGroups
{
/**
Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/Field.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/Field.java?view=diff&rev=551025&r1=551024&r2=551025
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/Field.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/Field.java Tue Jun 26 20:53:39 2007
@@ -27,60 +27,86 @@
* @version 2.1
* @since 2.1
*/
-@Target({ElementType.FIELD, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
public @interface Field
{
- /** Modifier for this field. */
- FieldPersistenceModifier persistenceModifier() default FieldPersistenceModifier.UNKNOWN;
-
- /** Whether this field is in the default fetch group. */
+ /** Modifier for this field.
+ * @return the persistence modifier
+ */
+ FieldPersistenceModifier persistenceModifier()
+ default FieldPersistenceModifier.UNKNOWN;
+
+ /** Whether this field is in the default fetch group.
+ * @return whether this field is in the default fetch group
+ */
String defaultFetchGroup() default "";
- /** Behaviour when inserting a null value. */
+ /** Behavior when this field contains a null value.
+ * @return the behavior when this field contains a null value
+ */
NullValue nullValue() default NullValue.NONE;
- /** Whether this field is embedded. */
+ /** Whether this field is embedded.
+ * @return whether this field is embedded
+ */
String embedded() default "";
- /** Whether this field is serialised into a single column. */
+ /** Whether this field is serialised into a single column.
+ * @return whether this field is serialized into a single column
+ */
String serialized() default "";
/** Whether related object(s) of this field are dependent
- * and so deleted when this object is deleted. */
+ * and so deleted when this object is deleted.
+ * @return whether the related object(s) of this field are dependent
+ */
String dependent() default "";
- /** Whether this field is part of the PK of the class. */
+ /** Whether this field is part of the primary key of the class.
+ * @return whether this field is part of the primary key of the class
+ */
String primaryKey() default "";
- /** Value strategy to use to populate this field (if any): */
+ /** Value strategy to use to populate this field (if any).
+ * @return the generated value strategy
+ */
IdGeneratorStrategy valueStrategy() default IdGeneratorStrategy.UNKNOWN;
- /** Name of a sequence to use with particular value strategies. */
+ /** Name of a sequence to use with particular value strategies.
+ */
String sequence() default "";
/** Name of the fetch-group to use when this field is loaded
- * due to being referenced etc */
+ * due to being referenced etc.
+ */
String loadFetchGroup() default "";
/** Type of the field. Used when the field is a reference type
- * and we want to be specific. */
+ * and we want to be specific.
+ */
Class fieldType() default void.class;
- /** Type of the field. This is used as an alternative to "tfieldType"
- * when the implementation supports specification of multiple key types.
- * If "fieldType" is specified then this is ignored. */
+ /** Type of the field. This is used as an alternative to "fieldType"
+ * when the implementation supports specification of multiple key types.
+ * If "fieldType" is specified then this is ignored.
+ */
Class[] fieldTypes() default {};
/** Name of the field in the fields class where this value is stored
- * (bidir relations). */
+ * (bidir relations).
+ */
String mappedBy() default "";
- /** Column definition(s) for this field. Used for embedded fields. */
+ /** Column definition(s) for this field. Used for embedded fields.
+ */
Column[] columns() default {};
- /** Name of the field when this is embedded in another object. */
+ /** Name of the field when this is embedded in another object.
+ */
String embeddedFieldName() default "";
- /** Vendor extensions for this field. */
+ /** Vendor extensions for this field.
+ */
Extension[] extensions() default {};
}
Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/Sequence.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/Sequence.java?view=diff&rev=551025&r1=551024&r2=551025
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/Sequence.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/Sequence.java Tue Jun 26 20:53:39 2007
@@ -28,21 +28,32 @@
* @version 2.1
* @since 2.1
*/
-@Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
public @interface Sequence
{
- /** The symbolic name of the datastore sequence. */
+ /** The symbolic name of the datastore sequence.
+ * @return the name of the sequence
+ */
String name();
- /** Strategy for the sequence. */
+ /** Strategy for the sequence.
+ * @return the strategy for the sequence
+ */
SequenceStrategy strategy();
- /** Name of the sequence in the datastore. */
+ /** Name of the sequence in the datastore.
+ * @return the name of the datastore sequence
+ */
String datastoreSequence() default "";
- /** Name of a factory class for generating the sequence values. */
+ /** Name of a factory class for generating the sequence values.
+ * @return the name of the factory class for the sequence
+ */
Class factoryClass() default void.class;
- /** Vendor extensions for this sequence. */
+ /** Vendor extensions for this sequence.
+ * @return vendor extensions
+ */
Extension[] extensions() default {};
}
Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/Table.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/Table.java?view=diff&rev=551025&r1=551024&r2=551025
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/Table.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/Table.java Tue Jun 26 20:53:39 2007
@@ -27,7 +27,8 @@
* @version 2.1
* @since 2.1
*/
-@Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
public @interface Table
{
/** Table to use for persisting this class. */