HV-481 Workaround for compiler bug

See http://bugs.sun.com/view_bug.do?bug_id=6512707

hibernate-validator/src/main/java/org/hibernate/validator/constraints/ConstraintComposition.java

@@ -23,6 +23,7 @@
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.hibernate.validator.constraints.CompositionType.AND;
 
 /**
  * Boolean operator that is applied to all constraints of a composing constraint annotation.
@@ -42,5 +43,5 @@
 	 * namely disjunction (OR), negation of the conjunction (ALL_FALSE),
 	 * or, the default, simple conjunction (AND).
 	 */
-	CompositionType value() default CompositionType.AND;
+	CompositionType value() default AND;
 }

hibernate-validator/src/main/java/org/hibernate/validator/constraints/SafeHtml.java

@@ -28,6 +28,7 @@
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.hibernate.validator.constraints.SafeHtml.WhiteListType.RELAXED;
 
 /**
  * Validate a rich text value provided by the user to ensure that it contains no malicious code, such as embedded
@@ -50,7 +51,7 @@
 	/**
 	 * @return The built-in whitelist type which will be applied to the rich text value
 	 */
-	WhiteListType whitelistType() default WhiteListType.RELAXED;
+	WhiteListType whitelistType() default RELAXED;
 
 	/**
 	 * @return Additional whitelist tags which are allowed on top of the tags specified by the