You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/11/27 01:23:46 UTC
svn commit: r721048 [3/5] - in
/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence:
./ spi/
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Expression.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Expression.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Expression.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Expression.java Wed Nov 26 16:23:43 2008
@@ -29,463 +29,463 @@
* predicate operands.
*/
public interface Expression extends SelectItem, PredicateOperand {
- /*
- * Conditional predicates over expression items
- */
- /**
- * Create a predicate for testing whether the expression is a member of the
- * association or element collection denoted by the path expression. The
- * argument must correspond to a collection-valued association or element
- * collection of like type.
- *
- * @param arg -
- * a path expression that specifies a collection-valued
- * association or an element collection
- * @return conditional predicate
- */
- Predicate member(PathExpression arg);
-
- /**
- * Create a predicate for testing whether the value of the expression is
- * null.
- *
- * @return conditional predicate
- */
- Predicate isNull();
-
- /**
- * Create a predicate for testing whether the expression value is a member
- * of the argument list.
- *
- * @param strings
- * @return conditional predicate
- */
- Predicate in(String... strings);
-
- /**
- * Create a predicate for testing whether the expression value is a member
- * of the argument list.
- *
- * @param nums
- * @return conditional predicate
- */
- Predicate in(Number... nums);
-
- /**
- * Create a predicate for testing whether the expression value is a member
- * of the argument list.
- *
- * @param enums
- * @return conditional predicate
- */
- Predicate in(Enum<?>... enums);
-
- /**
- * Create a predicate for testing whether the expression value is a member
- * of the argument list.
- *
- * @param classes
- * @return conditional predicate
- */
- Predicate in(Class... classes);
-
- /**
- * Create a predicate for testing whether the expression value is a member
- * of the argument list.
- *
- * @param params
- * @return conditional predicate
- */
- Predicate in(Expression... params);
-
- /**
- * Create a predicate for testing whether the expression value is a member
- * of a subquery result.
- *
- * @param subquery
- * @return conditional predicate
- */
- Predicate in(Subquery subquery);
-
- /*
- * Operations on strings
- */
- /**
- * String length This method must be invoked on an expression corresponding
- * to a string.
- *
- * @return expression denoting the length of the string.
- */
- Expression length();
-
- /**
- * Concatenate a string with other string(s). This method must be invoked on
- * an expression corresponding to a string.
- *
- * @param str -
- * string(s)
- * @return expression denoting the concatenation of the strings, starting
- * with the string corresponding to the expression on which the
- * method was invoked.
- */
- Expression concat(String... str);
-
- /**
- * Concatenate a string with other string(s). This method must be invoked on
- * an expression corresponding to a string.
- *
- * @param str -
- * expression(s) corresponding to string(s)
- * @return expression denoting the concatenation of the strings, starting
- * with the string corresponding to the expression on which the
- * method was invoked.
- */
- Expression concat(Expression... str);
-
- /**
- * Extract a substring starting at specified position through to the end of
- * the string. This method must be invoked on an expression corresponding to
- * a string.
- *
- * @param start -
- * start position (1 indicates first position)
- * @return expression denoting the extracted substring
- */
- Expression substring(int start);
-
- /**
- * Extract a substring starting at specified position through to the end of
- * the string. This method must be invoked on an expression corresponding to
- * a string.
- *
- * @param start -
- * expression denoting start position (1 indicates first
- * position)
- * @return expression denoting the extracted substring
- */
- Expression substring(Expression start);
-
- /**
- * Extract a substring. This method must be invoked on an expression
- * corresponding to a string.
- *
- * @param start -
- * start position (1 indicates first position)
- * @param len -
- * length of the substring to be returned
- * @return expression denoting the extracted substring
- */
- Expression substring(int start, int len);
-
- /**
- * Extract a substring. This method must be invoked on an expression
- * corresponding to a string.
- *
- * @param start -
- * start position (1 indicates first position)
- * @param len -
- * expression denoting length of the substring to return
- * @return expression denoting the extracted substring
- */
- Expression substring(int start, Expression len);
-
- /**
- * Extract a substring. This method must be invoked on an expression
- * corresponding to a string.
- *
- * @param start -
- * expression denoting start position (1 indicates first
- * position)
- * @param len -
- * length of the substring to return
- * @return expression denoting the extracted substring
- */
- Expression substring(Expression start, int len);
-
- /**
- * Extract a substring. This method must be invoked on an expression
- * corresponding to a string.
- *
- * @param start -
- * expression denoting start position (1 indicates first
- * position)
- * @param len -
- * expression denoting length of the substring to return
- * @return expression denoting the extracted substring
- */
- Expression substring(Expression start, Expression len);
-
- /**
- * Convert string to lowercase. This method must be invoked on an expression
- * corresponding to a string.
- *
- * @return expression denoting the string in lowercase
- */
- Expression lower();
-
- /**
- * Convert string to uppercase. This method must be invoked on an expression
- * corresponding to a string.
- *
- * @return expression denoting the string in uppercase
- */
- Expression upper();
-
- /**
- * Trim leading and trailing blanks. This method must be invoked on an
- * expression corresponding to a string.
- *
- * @return expression denoting trimmed string
- */
- Expression trim();
-
- /**
- * Trim leading, trailing blanks (or both) as specified by trim spec. This
- * method must be invoked on an expression corresponding to a string.
- *
- * @param spec -
- * trim specification
- * @return expression denoting trimmed string
- */
- Expression trim(TrimSpec spec);
-
- /**
- * Trim leading and trailing occurrences of character from the string. This
- * method must be invoked on an expression corresponding to a string.
- *
- * @param c -
- * character to be trimmed
- * @return expression denoting trimmed string
- */
- Expression trim(char c);
-
- /**
- * Trim occurrences of the character from leading or trailing (or both)
- * positions of the string, as specified by trim spec. This method must be
- * invoked on an expression corresponding to a string.
- *
- * @param c -
- * character to be trimmed
- * @param spec -
- * trim specification
- * @return expression denoting trimmed string
- */
- Expression trim(char c, TrimSpec spec);
-
- /**
- * Trim leading and trailing occurrences of character specified by the
- * expression argument from the string. This method must be invoked on an
- * expression corresponding to a string.
- *
- * @param expr -
- * expression corresponding to the character to be trimmed
- * @return expression denoting trimmed string
- */
- Expression trim(Expression expr);
-
- /**
- * Trim occurrences of the character specified by the expression argument
- * from leading or trailing (or both) positions of the string, as specified
- * by trim spec. This method must be invoked on an expression corresponding
- * to a string.
- *
- * @param expr -
- * expression corresponding to the character to be trimmed
- * @param spec -
- * trim specification
- * @return expression denoting trimmed string
- */
- Expression trim(Expression expr, TrimSpec spec);
-
- /**
- * Locate a string contained within the string corresponding to the
- * expression on which the method was invoked. The search is started at
- * position 1 (first string position). This method must be invoked on an
- * expression corresponding to a string.
- *
- * @param str -
- * string to be located
- * @return expression denoting the first position at which the string was
- * found or expression denoting 0 if the string was not found
- */
- Expression locate(String str);
-
- /**
- * Locate a string contained within the string corresponding to the
- * expression on which the method was invoked. The search is started at
- * position 1 (first string position). This method must be invoked on an
- * expression corresponding to a string.
- *
- * @param str -
- * expression corresponding to the string to be located
- * @return expression denoting the first position at which the string was
- * found or expression denoting 0 if the string was not found
- */
- Expression locate(Expression str);
-
- /**
- * Locate a string contained within the string corresponding to the
- * expression on which the method was invoked, starting at a specified
- * search position. This method must be invoked on an expression
- * corresponding to a string.
- *
- * @param str -
- * string to be located
- * @param position -
- * position at which to start the search
- * @return expression denoting the first position at which the string was
- * found or expression denoting 0 if the string was not found
- */
- Expression locate(String str, int position);
-
- /**
- * Locate a string contained within the string corresponding to the
- * expression on which the method was invoked, starting at a specified
- * search position. This method must be invoked on an expression
- * corresponding to a string.
- *
- * @param str -
- * string to be located
- * @param position -
- * expression corresponding to position at which to start the
- * search
- * @return expression denoting the first position at which the string was
- * found or expression denoting 0 if the string was not found
- */
- Expression locate(String str, Expression position);
-
- /**
- * Locate a string contained within the string corresponding to the
- * expression on which the method was invoked, starting at a specified
- * search position. This method must be invoked on an expression
- * corresponding to a string.
- *
- * @param str -
- * expression corresponding to the string to be located
- * @param position -
- * position at which to start the search
- * @return expression denoting the first position at which the string was
- * found or expression denoting 0 if the string was not found
- */
- Expression locate(Expression str, int position);
-
- /**
- * Locate a string contained within the string corresponding to the
- * expression on which the method was invoked, starting at a specified
- * search position. This method must be invoked on an expression
- * corresponding to a string.
- *
- * @param str -
- * expression corresponding to the string to be located
- * @param position -
- * expression corresponding to position at which to start the
- * search
- * @return expression denoting the first position at which the string was
- * found or expression denoting 0 if the string was not found
- */
- Expression locate(Expression str, Expression position);
-
- /*
- * Arithmetic operations
- */
- /**
- * Addition. This method must be invoked on an expression corresponding to a
- * number.
- *
- * @param num -
- * number to be added
- * @return expression denoting the sum
- */
- Expression plus(Number num);
-
- /**
- * Addition. This method must be invoked on an expression corresponding to a
- * number.
- *
- * @param expr -
- * expression corresponding to number to be added
- * @return expression denoting the sum
- */
- Expression plus(Expression expr);
-
- /**
- * Unary minus. This method must be invoked on an expression corresponding
- * to a number.
- *
- * @return expression denoting the unary minus of the expression
- */
- Expression minus();
-
- /**
- * Subtraction. This method must be invoked on an expression corresponding
- * to a number.
- *
- * @param num -
- * subtrahend
- * @return expression denoting the result of subtracting the argument from
- * the number corresponding to the expression on which the method
- * was invoked.
- */
- Expression minus(Number num);
-
- /**
- * Subtraction. This method must be invoked on an expression corresponding
- * to a number.
- *
- * @param expr -
- * expression corresponding to subtrahend
- * @return expression denoting the result of subtracting the number denoted
- * by the argument from the number corresponding to the expression
- * on which the method was invoked.
- */
- Expression minus(Expression expr);
-
- /**
- * Division. This method must be invoked on an expression corresponding to a
- * number.
- *
- * @param num -
- * divisor
- * @return expression denoting the result of dividing the number
- * corresponding to the expression on which the method was invoked
- * by the argument
- */
- Expression dividedBy(Number num);
-
- /**
- * Division. This method must be invoked on an expression corresponding to a
- * number.
- *
- * @param expr -
- * expression corresponding to the divisor
- * @return expression denoting the result of dividing the number
- * corresponding to the expression on which the method was invoked
- * by the number denoted by the argument
- */
- Expression dividedBy(Expression expr);
-
- /**
- * Multiplication. This method must be invoked on an expression
- * corresponding to a number.
- *
- * @param num -
- * multiplier
- * @return expression denoting the result of multiplying the argument with
- * the number corresponding to the expression on which the method
- * was invoked.
- */
- Expression times(Number num);
-
- /**
- * Multiplication. This method must be invoked on an expression
- * corresponding to a number.
- *
- * @param expr -
- * expression corresponding to the multiplier
- * @return expression denoting the result of multiplying the number denoted
- * by the argument with the number corresponding to the expression
- * on which the method was invoked.
- */
+ /*
+ * Conditional predicates over expression items
+ */
+ /**
+ * Create a predicate for testing whether the expression is a member of the
+ * association or element collection denoted by the path expression. The
+ * argument must correspond to a collection-valued association or element
+ * collection of like type.
+ *
+ * @param arg -
+ * a path expression that specifies a collection-valued
+ * association or an element collection
+ * @return conditional predicate
+ */
+ Predicate member(PathExpression arg);
+
+ /**
+ * Create a predicate for testing whether the value of the expression is
+ * null.
+ *
+ * @return conditional predicate
+ */
+ Predicate isNull();
+
+ /**
+ * Create a predicate for testing whether the expression value is a member
+ * of the argument list.
+ *
+ * @param strings
+ * @return conditional predicate
+ */
+ Predicate in(String... strings);
+
+ /**
+ * Create a predicate for testing whether the expression value is a member
+ * of the argument list.
+ *
+ * @param nums
+ * @return conditional predicate
+ */
+ Predicate in(Number... nums);
+
+ /**
+ * Create a predicate for testing whether the expression value is a member
+ * of the argument list.
+ *
+ * @param enums
+ * @return conditional predicate
+ */
+ Predicate in(Enum<?>... enums);
+
+ /**
+ * Create a predicate for testing whether the expression value is a member
+ * of the argument list.
+ *
+ * @param classes
+ * @return conditional predicate
+ */
+ Predicate in(Class... classes);
+
+ /**
+ * Create a predicate for testing whether the expression value is a member
+ * of the argument list.
+ *
+ * @param params
+ * @return conditional predicate
+ */
+ Predicate in(Expression... params);
+
+ /**
+ * Create a predicate for testing whether the expression value is a member
+ * of a subquery result.
+ *
+ * @param subquery
+ * @return conditional predicate
+ */
+ Predicate in(Subquery subquery);
+
+ /*
+ * Operations on strings
+ */
+ /**
+ * String length This method must be invoked on an expression corresponding
+ * to a string.
+ *
+ * @return expression denoting the length of the string.
+ */
+ Expression length();
+
+ /**
+ * Concatenate a string with other string(s). This method must be invoked on
+ * an expression corresponding to a string.
+ *
+ * @param str -
+ * string(s)
+ * @return expression denoting the concatenation of the strings, starting
+ * with the string corresponding to the expression on which the
+ * method was invoked.
+ */
+ Expression concat(String... str);
+
+ /**
+ * Concatenate a string with other string(s). This method must be invoked on
+ * an expression corresponding to a string.
+ *
+ * @param str -
+ * expression(s) corresponding to string(s)
+ * @return expression denoting the concatenation of the strings, starting
+ * with the string corresponding to the expression on which the
+ * method was invoked.
+ */
+ Expression concat(Expression... str);
+
+ /**
+ * Extract a substring starting at specified position through to the end of
+ * the string. This method must be invoked on an expression corresponding to
+ * a string.
+ *
+ * @param start -
+ * start position (1 indicates first position)
+ * @return expression denoting the extracted substring
+ */
+ Expression substring(int start);
+
+ /**
+ * Extract a substring starting at specified position through to the end of
+ * the string. This method must be invoked on an expression corresponding to
+ * a string.
+ *
+ * @param start -
+ * expression denoting start position (1 indicates first
+ * position)
+ * @return expression denoting the extracted substring
+ */
+ Expression substring(Expression start);
+
+ /**
+ * Extract a substring. This method must be invoked on an expression
+ * corresponding to a string.
+ *
+ * @param start -
+ * start position (1 indicates first position)
+ * @param len -
+ * length of the substring to be returned
+ * @return expression denoting the extracted substring
+ */
+ Expression substring(int start, int len);
+
+ /**
+ * Extract a substring. This method must be invoked on an expression
+ * corresponding to a string.
+ *
+ * @param start -
+ * start position (1 indicates first position)
+ * @param len -
+ * expression denoting length of the substring to return
+ * @return expression denoting the extracted substring
+ */
+ Expression substring(int start, Expression len);
+
+ /**
+ * Extract a substring. This method must be invoked on an expression
+ * corresponding to a string.
+ *
+ * @param start -
+ * expression denoting start position (1 indicates first
+ * position)
+ * @param len -
+ * length of the substring to return
+ * @return expression denoting the extracted substring
+ */
+ Expression substring(Expression start, int len);
+
+ /**
+ * Extract a substring. This method must be invoked on an expression
+ * corresponding to a string.
+ *
+ * @param start -
+ * expression denoting start position (1 indicates first
+ * position)
+ * @param len -
+ * expression denoting length of the substring to return
+ * @return expression denoting the extracted substring
+ */
+ Expression substring(Expression start, Expression len);
+
+ /**
+ * Convert string to lowercase. This method must be invoked on an expression
+ * corresponding to a string.
+ *
+ * @return expression denoting the string in lowercase
+ */
+ Expression lower();
+
+ /**
+ * Convert string to uppercase. This method must be invoked on an expression
+ * corresponding to a string.
+ *
+ * @return expression denoting the string in uppercase
+ */
+ Expression upper();
+
+ /**
+ * Trim leading and trailing blanks. This method must be invoked on an
+ * expression corresponding to a string.
+ *
+ * @return expression denoting trimmed string
+ */
+ Expression trim();
+
+ /**
+ * Trim leading, trailing blanks (or both) as specified by trim spec. This
+ * method must be invoked on an expression corresponding to a string.
+ *
+ * @param spec -
+ * trim specification
+ * @return expression denoting trimmed string
+ */
+ Expression trim(TrimSpec spec);
+
+ /**
+ * Trim leading and trailing occurrences of character from the string. This
+ * method must be invoked on an expression corresponding to a string.
+ *
+ * @param c -
+ * character to be trimmed
+ * @return expression denoting trimmed string
+ */
+ Expression trim(char c);
+
+ /**
+ * Trim occurrences of the character from leading or trailing (or both)
+ * positions of the string, as specified by trim spec. This method must be
+ * invoked on an expression corresponding to a string.
+ *
+ * @param c -
+ * character to be trimmed
+ * @param spec -
+ * trim specification
+ * @return expression denoting trimmed string
+ */
+ Expression trim(char c, TrimSpec spec);
+
+ /**
+ * Trim leading and trailing occurrences of character specified by the
+ * expression argument from the string. This method must be invoked on an
+ * expression corresponding to a string.
+ *
+ * @param expr -
+ * expression corresponding to the character to be trimmed
+ * @return expression denoting trimmed string
+ */
+ Expression trim(Expression expr);
+
+ /**
+ * Trim occurrences of the character specified by the expression argument
+ * from leading or trailing (or both) positions of the string, as specified
+ * by trim spec. This method must be invoked on an expression corresponding
+ * to a string.
+ *
+ * @param expr -
+ * expression corresponding to the character to be trimmed
+ * @param spec -
+ * trim specification
+ * @return expression denoting trimmed string
+ */
+ Expression trim(Expression expr, TrimSpec spec);
+
+ /**
+ * Locate a string contained within the string corresponding to the
+ * expression on which the method was invoked. The search is started at
+ * position 1 (first string position). This method must be invoked on an
+ * expression corresponding to a string.
+ *
+ * @param str -
+ * string to be located
+ * @return expression denoting the first position at which the string was
+ * found or expression denoting 0 if the string was not found
+ */
+ Expression locate(String str);
+
+ /**
+ * Locate a string contained within the string corresponding to the
+ * expression on which the method was invoked. The search is started at
+ * position 1 (first string position). This method must be invoked on an
+ * expression corresponding to a string.
+ *
+ * @param str -
+ * expression corresponding to the string to be located
+ * @return expression denoting the first position at which the string was
+ * found or expression denoting 0 if the string was not found
+ */
+ Expression locate(Expression str);
+
+ /**
+ * Locate a string contained within the string corresponding to the
+ * expression on which the method was invoked, starting at a specified
+ * search position. This method must be invoked on an expression
+ * corresponding to a string.
+ *
+ * @param str -
+ * string to be located
+ * @param position -
+ * position at which to start the search
+ * @return expression denoting the first position at which the string was
+ * found or expression denoting 0 if the string was not found
+ */
+ Expression locate(String str, int position);
+
+ /**
+ * Locate a string contained within the string corresponding to the
+ * expression on which the method was invoked, starting at a specified
+ * search position. This method must be invoked on an expression
+ * corresponding to a string.
+ *
+ * @param str -
+ * string to be located
+ * @param position -
+ * expression corresponding to position at which to start the
+ * search
+ * @return expression denoting the first position at which the string was
+ * found or expression denoting 0 if the string was not found
+ */
+ Expression locate(String str, Expression position);
+
+ /**
+ * Locate a string contained within the string corresponding to the
+ * expression on which the method was invoked, starting at a specified
+ * search position. This method must be invoked on an expression
+ * corresponding to a string.
+ *
+ * @param str -
+ * expression corresponding to the string to be located
+ * @param position -
+ * position at which to start the search
+ * @return expression denoting the first position at which the string was
+ * found or expression denoting 0 if the string was not found
+ */
+ Expression locate(Expression str, int position);
+
+ /**
+ * Locate a string contained within the string corresponding to the
+ * expression on which the method was invoked, starting at a specified
+ * search position. This method must be invoked on an expression
+ * corresponding to a string.
+ *
+ * @param str -
+ * expression corresponding to the string to be located
+ * @param position -
+ * expression corresponding to position at which to start the
+ * search
+ * @return expression denoting the first position at which the string was
+ * found or expression denoting 0 if the string was not found
+ */
+ Expression locate(Expression str, Expression position);
+
+ /*
+ * Arithmetic operations
+ */
+ /**
+ * Addition. This method must be invoked on an expression corresponding to a
+ * number.
+ *
+ * @param num -
+ * number to be added
+ * @return expression denoting the sum
+ */
+ Expression plus(Number num);
+
+ /**
+ * Addition. This method must be invoked on an expression corresponding to a
+ * number.
+ *
+ * @param expr -
+ * expression corresponding to number to be added
+ * @return expression denoting the sum
+ */
+ Expression plus(Expression expr);
+
+ /**
+ * Unary minus. This method must be invoked on an expression corresponding
+ * to a number.
+ *
+ * @return expression denoting the unary minus of the expression
+ */
+ Expression minus();
+
+ /**
+ * Subtraction. This method must be invoked on an expression corresponding
+ * to a number.
+ *
+ * @param num -
+ * subtrahend
+ * @return expression denoting the result of subtracting the argument from
+ * the number corresponding to the expression on which the method
+ * was invoked.
+ */
+ Expression minus(Number num);
+
+ /**
+ * Subtraction. This method must be invoked on an expression corresponding
+ * to a number.
+ *
+ * @param expr -
+ * expression corresponding to subtrahend
+ * @return expression denoting the result of subtracting the number denoted
+ * by the argument from the number corresponding to the expression
+ * on which the method was invoked.
+ */
+ Expression minus(Expression expr);
+
+ /**
+ * Division. This method must be invoked on an expression corresponding to a
+ * number.
+ *
+ * @param num -
+ * divisor
+ * @return expression denoting the result of dividing the number
+ * corresponding to the expression on which the method was invoked
+ * by the argument
+ */
+ Expression dividedBy(Number num);
+
+ /**
+ * Division. This method must be invoked on an expression corresponding to a
+ * number.
+ *
+ * @param expr -
+ * expression corresponding to the divisor
+ * @return expression denoting the result of dividing the number
+ * corresponding to the expression on which the method was invoked
+ * by the number denoted by the argument
+ */
+ Expression dividedBy(Expression expr);
+
+ /**
+ * Multiplication. This method must be invoked on an expression
+ * corresponding to a number.
+ *
+ * @param num -
+ * multiplier
+ * @return expression denoting the result of multiplying the argument with
+ * the number corresponding to the expression on which the method
+ * was invoked.
+ */
+ Expression times(Number num);
+
+ /**
+ * Multiplication. This method must be invoked on an expression
+ * corresponding to a number.
+ *
+ * @param expr -
+ * expression corresponding to the multiplier
+ * @return expression denoting the result of multiplying the number denoted
+ * by the argument with the number corresponding to the expression
+ * on which the method was invoked.
+ */
Expression times(Expression expr);
/**
@@ -517,14 +517,14 @@
Expression mod(int num);
/**
- * Modulo operation. This must be invoked on an expression corresponding to
- * an integer value
- *
- * @param expr -
- * expression corresponding to integer divisor
- * @return expression corresponding to the integer remainder of the division
- * of the integer corresponding to the expression on which the
- * method was invoked by the argument.
- */
+ * Modulo operation. This must be invoked on an expression corresponding to
+ * an integer value
+ *
+ * @param expr -
+ * expression corresponding to integer divisor
+ * @return expression corresponding to the integer remainder of the division
+ * of the integer corresponding to the expression on which the
+ * method was invoked by the argument.
+ */
Expression mod(Expression expr);
}
\ No newline at end of file
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FieldResult.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FieldResult.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FieldResult.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FieldResult.java Wed Nov 26 16:23:43 2008
@@ -24,9 +24,9 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GeneratedValue.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GeneratedValue.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GeneratedValue.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GeneratedValue.java Wed Nov 26 16:23:43 2008
@@ -24,16 +24,18 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
*/
-@Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
public @interface GeneratedValue {
GenerationType strategy() default GenerationType.AUTO;
+
String generator() default "";
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Id.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Id.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Id.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Id.java Wed Nov 26 16:23:43 2008
@@ -24,12 +24,12 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
-@Target( { ElementType.METHOD, ElementType.FIELD })
+@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
public @interface Id {
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/IdClass.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/IdClass.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/IdClass.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/IdClass.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Inheritance.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Inheritance.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Inheritance.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Inheritance.java Wed Nov 26 16:23:43 2008
@@ -25,10 +25,10 @@
package javax.persistence;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumn.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumn.java Wed Nov 26 16:23:43 2008
@@ -25,10 +25,10 @@
package javax.persistence;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumns.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumns.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumns.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumns.java Wed Nov 26 16:23:43 2008
@@ -25,10 +25,10 @@
package javax.persistence;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinTable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinTable.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinTable.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinTable.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Lob.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Lob.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Lob.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Lob.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToMany.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToMany.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToMany.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToMany.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToOne.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToOne.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToOne.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToOne.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKey.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKey.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKey.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKey.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyClass.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyClass.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyClass.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyClass.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyColumn.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyColumn.java Wed Nov 26 16:23:43 2008
@@ -24,22 +24,31 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
public @interface MapKeyColumn {
String name() default "";
+
boolean unique() default false;
+
boolean nullable() default false;
+
boolean insertable() default true;
+
boolean updatable() default true;
+
String columnDefinition() default "";
+
String table() default "";
+
int length() default 255;
+
int precision() default 0; // decimal precision
+
int scale() default 0; // decimal scale
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java Wed Nov 26 16:23:43 2008
@@ -24,20 +24,27 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
public @interface MapKeyJoinColumn {
String name() default "";
+
String referencedColumnName() default "";
+
boolean unique() default false;
+
boolean nullable() default false;
+
boolean insertable() default true;
+
boolean updatable() default true;
+
String columnDefinition() default "";
+
String table() default "";
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedById.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedById.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedById.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedById.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedSuperclass.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedSuperclass.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedSuperclass.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedSuperclass.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQueries.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQueries.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQueries.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQueries.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQuery.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQuery.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQuery.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQuery.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQueries.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQueries.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQueries.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQueries.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQuery.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQuery.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQuery.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQuery.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToMany.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToMany.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToMany.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToMany.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToOne.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToOne.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToOne.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToOne.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OptimisticLockException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OptimisticLockException.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OptimisticLockException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OptimisticLockException.java Wed Nov 26 16:23:43 2008
@@ -31,7 +31,7 @@
this.entity = null;
}
- public OptimisticLockException(Object entity){
+ public OptimisticLockException(Object entity) {
super();
this.entity = entity;
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderBy.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderBy.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderBy.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderBy.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderColumn.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderColumn.java Wed Nov 26 16:23:43 2008
@@ -24,20 +24,27 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
public @interface OrderColumn {
String name() default "";
+
boolean nullable() default true;
+
boolean insertable() default true;
+
boolean updatable() default true;
+
String columnDefinition() default "";
+
boolean contiguous() default true;
+
int base() default 0;
+
String table() default "";
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PathExpression.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PathExpression.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PathExpression.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PathExpression.java Wed Nov 26 16:23:43 2008
@@ -28,93 +28,93 @@
* Interface for operations over objects reached via paths
*/
public interface PathExpression extends Expression {
- /**
- * Return a path expression corresponding to the referenced attribute. It is
- * not permitted to invoke this method on a path expression that corresponds
- * to a multi-valued association or element collection. The path expression
- * on which this method is invoked must correspond to a class containing the
- * referenced attribute.
- *
- * @param attributeName -
- * name of the referenced attribute
- * @return path expression
- */
- PathExpression get(String attributeName);
-
- /**
- * Return an expression that corresponds to the type of the entity. This
- * method can only be invoked on a path expression corresponding to an
- * entity. It is not permitted to invoke this method on a path expression
- * that corresponds to a multi-valued association.
- *
- * @return expression denoting the entity's type
- */
- Expression type();
-
- /**
- * Return an expression that corresponds to the number of elements
- * association or element collection corresponding to the path expression.
- * This method can only be invoked on a path expression that corresponds to
- * a multi-valued association or to an element collection.
- *
- * @return expression denoting the size
- */
- Expression size();
-
- /**
- * Add a restriction that the path expression must correspond to an
- * association or element collection that is empty (has no elements). This
- * method can only be invoked on a path expression that corresponds to a
- * multi-valued association or to an element collection.
- *
- * @return predicate corresponding to the restriction
- */
- Predicate isEmpty();
-
- /**
- * Specify that the avg operation is to be applied. The path expression must
- * correspond to an attribute of a numeric type. It is not permitted to
- * invoke this method on a path expression that corresponds to a
- * multi-valued association or element collection.
- *
- * @return the resulting aggregate
- */
- Aggregate avg();
-
- /**
- * Specify that the max operation is to be applied. The path expression must
- * correspond to an attribute of an orderable type. It is not permitted to
- * invoke this method on a path expression that corresponds to a
- * multi-valued association or element collection.
- *
- * @return the resulting aggregate
- */
- Aggregate max();
-
- /**
- * Specify that the min operation is to be applied. The path expression must
- * correspond to an attribute of an orderable type. It is not permitted to
- * invoke this method on a path expression that corresponds to a
- * multi-valued association or element collection.
- *
- * @return the resulting aggregate
- */
- Aggregate min();
-
- /**
- * Specify that the count operation is to be applied. It is not permitted to
- * invoke this method on a path expression that corresponds to a
- * multi-valued association or element collection.
- *
- * @return the resulting aggregate
- */
- Aggregate count();
-
- /**
- * Specify that the sum operation is to be applied. The path expression must
- * correspond to an attribute of a numeric type. It is not permitted to
- * invoke this method on a path expression that corresponds to a
- * multi-valued association or element collection.
+ /**
+ * Return a path expression corresponding to the referenced attribute. It is
+ * not permitted to invoke this method on a path expression that corresponds
+ * to a multi-valued association or element collection. The path expression
+ * on which this method is invoked must correspond to a class containing the
+ * referenced attribute.
+ *
+ * @param attributeName -
+ * name of the referenced attribute
+ * @return path expression
+ */
+ PathExpression get(String attributeName);
+
+ /**
+ * Return an expression that corresponds to the type of the entity. This
+ * method can only be invoked on a path expression corresponding to an
+ * entity. It is not permitted to invoke this method on a path expression
+ * that corresponds to a multi-valued association.
+ *
+ * @return expression denoting the entity's type
+ */
+ Expression type();
+
+ /**
+ * Return an expression that corresponds to the number of elements
+ * association or element collection corresponding to the path expression.
+ * This method can only be invoked on a path expression that corresponds to
+ * a multi-valued association or to an element collection.
+ *
+ * @return expression denoting the size
+ */
+ Expression size();
+
+ /**
+ * Add a restriction that the path expression must correspond to an
+ * association or element collection that is empty (has no elements). This
+ * method can only be invoked on a path expression that corresponds to a
+ * multi-valued association or to an element collection.
+ *
+ * @return predicate corresponding to the restriction
+ */
+ Predicate isEmpty();
+
+ /**
+ * Specify that the avg operation is to be applied. The path expression must
+ * correspond to an attribute of a numeric type. It is not permitted to
+ * invoke this method on a path expression that corresponds to a
+ * multi-valued association or element collection.
+ *
+ * @return the resulting aggregate
+ */
+ Aggregate avg();
+
+ /**
+ * Specify that the max operation is to be applied. The path expression must
+ * correspond to an attribute of an orderable type. It is not permitted to
+ * invoke this method on a path expression that corresponds to a
+ * multi-valued association or element collection.
+ *
+ * @return the resulting aggregate
+ */
+ Aggregate max();
+
+ /**
+ * Specify that the min operation is to be applied. The path expression must
+ * correspond to an attribute of an orderable type. It is not permitted to
+ * invoke this method on a path expression that corresponds to a
+ * multi-valued association or element collection.
+ *
+ * @return the resulting aggregate
+ */
+ Aggregate min();
+
+ /**
+ * Specify that the count operation is to be applied. It is not permitted to
+ * invoke this method on a path expression that corresponds to a
+ * multi-valued association or element collection.
+ *
+ * @return the resulting aggregate
+ */
+ Aggregate count();
+
+ /**
+ * Specify that the sum operation is to be applied. The path expression must
+ * correspond to an attribute of a numeric type. It is not permitted to
+ * invoke this method on a path expression that corresponds to a
+ * multi-valued association or element collection.
*
* @return the resulting aggregate
*/
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Persistence.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Persistence.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Persistence.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Persistence.java Wed Nov 26 16:23:43 2008
@@ -30,8 +30,8 @@
import java.net.URL;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.Map;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
import javax.persistence.spi.PersistenceProvider;
@@ -52,7 +52,7 @@
public static final java.lang.String PERSISTENCE_PROVIDER = "javax.persistence.spi.PeristenceProvider";
static final String PERSISTENCE_PROVIDER_PROPERTY = "javax.persistence.provider";
static final String PERSISTENCE_PROVIDER_SERVICE = "META-INF/services/"
- + PersistenceProvider.class.getName();
+ + PersistenceProvider.class.getName();
/**
* Create and return an EntityManagerFactory for the named persistence unit.
@@ -64,7 +64,7 @@
public static EntityManagerFactory createEntityManagerFactory(
String persistenceUnitName) {
return createEntityManagerFactory(persistenceUnitName, Collections.EMPTY_MAP);
- }
+ }
/**
* Create and return an EntityManagerFactory for the named persistence unit using the
@@ -102,7 +102,7 @@
ClassLoader loader = Thread.currentThread().getContextClassLoader();
try {
Enumeration<URL> providers = loader
- .getResources(PERSISTENCE_PROVIDER_SERVICE);
+ .getResources(PERSISTENCE_PROVIDER_SERVICE);
while (providers.hasMoreElements()) {
String name = getProviderName(providers.nextElement());
@@ -125,13 +125,13 @@
}
return null;
- }
+ }
static String getProviderName(URL url) throws IOException {
BufferedReader in = new BufferedReader(new InputStreamReader(
- url.openStream(),
- "UTF-8"));
+ url.openStream(),
+ "UTF-8"));
String providerName;
@@ -153,7 +153,7 @@
String providerName,
String persistenceUnitName,
Map properties)
- throws PersistenceException {
+ throws PersistenceException {
Class providerClass;
try {
@@ -168,7 +168,7 @@
try {
PersistenceProvider provider = (PersistenceProvider) providerClass
- .newInstance();
+ .newInstance();
return provider.createEntityManagerFactory(persistenceUnitName,
properties);
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContext.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContext.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContext.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
@@ -35,12 +35,12 @@
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceContext {
- String name() default "";
+ String name() default "";
- String unitName() default "";
+ String unitName() default "";
- PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+ PersistenceContextType type() default PersistenceContextType.TRANSACTION;
- PersistenceProperty[] properties() default {};
+ PersistenceProperty[] properties() default {};
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContexts.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContexts.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContexts.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContexts.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceProperty.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceProperty.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceProperty.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceProperty.java Wed Nov 26 16:23:43 2008
@@ -31,7 +31,7 @@
@Target({})
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceProperty {
- String name();
+ String name();
- String value();
+ String value();
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnit.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnit.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnit.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnit.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnits.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnits.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnits.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnits.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockException.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockException.java Wed Nov 26 16:23:43 2008
@@ -31,7 +31,7 @@
this.entity = null;
}
- public PessimisticLockException(Object entity){
+ public PessimisticLockException(Object entity) {
super();
this.entity = entity;
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostLoad.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostLoad.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostLoad.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostLoad.java Wed Nov 26 16:23:43 2008
@@ -24,15 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
*/
-@Target( { ElementType.METHOD })
+@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface PostLoad {
}
\ No newline at end of file
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostPersist.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostPersist.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostPersist.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostPersist.java Wed Nov 26 16:23:43 2008
@@ -24,15 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
*/
-@Target( { ElementType.METHOD })
+@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface PostPersist {
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostRemove.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostRemove.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostRemove.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostRemove.java Wed Nov 26 16:23:43 2008
@@ -24,15 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
*/
-@Target( { ElementType.METHOD })
+@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface PostRemove {
}
\ No newline at end of file
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostUpdate.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostUpdate.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostUpdate.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostUpdate.java Wed Nov 26 16:23:43 2008
@@ -24,15 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
*/
-@Target( { ElementType.METHOD })
+@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface PostUpdate {
}
\ No newline at end of file
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrePersist.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrePersist.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrePersist.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrePersist.java Wed Nov 26 16:23:43 2008
@@ -24,15 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
*/
-@Target( { ElementType.METHOD })
+@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface PrePersist {
}
\ No newline at end of file
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreRemove.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreRemove.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreRemove.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreRemove.java Wed Nov 26 16:23:43 2008
@@ -24,15 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
*/
-@Target( { ElementType.METHOD })
+@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface PreRemove {
}
\ No newline at end of file
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreUpdate.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreUpdate.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreUpdate.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreUpdate.java Wed Nov 26 16:23:43 2008
@@ -24,15 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
*/
-@Target( { ElementType.METHOD })
+@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface PreUpdate {
}
\ No newline at end of file
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Predicate.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Predicate.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Predicate.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Predicate.java Wed Nov 26 16:23:43 2008
@@ -28,30 +28,30 @@
* Interface used to define compound predicates.
*/
public interface Predicate {
- /**
- * Creates an AND of the predicate with the argument.
- *
- * @param predicate -
- * A simple or compound predicate
- * @return the predicate that is the AND of the original simple or compound
- * predicate and the argument.
- */
- Predicate and(Predicate predicate);
+ /**
+ * Creates an AND of the predicate with the argument.
+ *
+ * @param predicate -
+ * A simple or compound predicate
+ * @return the predicate that is the AND of the original simple or compound
+ * predicate and the argument.
+ */
+ Predicate and(Predicate predicate);
- /**
- * Creates an OR of the predicate with the argument.
- *
- * @param predicate -
- * A simple or compound predicate
- * @return the predicate that is the OR of the original simple or compound
- * predicate and the argument.
- */
- Predicate or(Predicate predicate);
+ /**
+ * Creates an OR of the predicate with the argument.
+ *
+ * @param predicate -
+ * A simple or compound predicate
+ * @return the predicate that is the OR of the original simple or compound
+ * predicate and the argument.
+ */
+ Predicate or(Predicate predicate);
- /**
- * Creates a negation of the predicate with the argument.
- *
- * @return the predicate that is the negation of the original simple or
+ /**
+ * Creates a negation of the predicate with the argument.
+ *
+ * @return the predicate that is the negation of the original simple or
* compound predicate.
*/
Predicate not();