backport tiny changes from openejb trunk to 3.2 to make it compile for me in eclipse

gistfile1.txt

=== modified file 'container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java'
--- container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java     2011-05-10 11:55:23 +0000
+++ container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java     2011-08-12 21:15:51 +0000
@@ -97,6 +97,7 @@
         return factory;
     }
 
+    @SuppressWarnings("unchecked")
     private static Configuration<?> getConfig(ValidationInfo info) {
         Configuration<?> target = null;
         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
@@ -104,8 +105,8 @@
         String providerClassName = info.providerClassName;
         if (providerClassName != null) {
             try {
-                @SuppressWarnings("unchecked")
-                Class<? extends ValidationProvider> clazz = (Class<? extends ValidationProvider>) classLoader.loadClass(providerClassName);
+                @SuppressWarnings("rawtypes")
+                Class clazz = (Class<? extends ValidationProvider>) classLoader.loadClass(providerClassName);
                 target = Validation.byProvider(clazz).configure();
                 logger.info("Using " + providerClassName + " as validation provider.");
             } catch (ClassNotFoundException e) {

=== modified file 'container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java'
--- container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java       2010-10-12 20:00:51 +0000
+++ container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java       2011-08-12 21:15:51 +0000
@@ -162,7 +162,7 @@
         }
     }
 
-    public Class get(String property, Class defaultValue) {
+    public Class<?> get(String property, Class<?> defaultValue) {
         String className = properties.getProperty(property);
 
         if (className == null) return parent.get(property, defaultValue);