geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r1165841 - in /geronimo/xbean/trunk: xbean-blueprint/ xbean-blueprint/src/main/java/org/apache/xbean/blueprint/cm/ xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/ xbean-finder/src/main/java/org/apache/xbean/finder/ xbean-...
Date Tue, 06 Sep 2011 21:02:41 GMT
Author: dblevins
Date: Tue Sep  6 21:02:40 2011
New Revision: 1165841

URL: http://svn.apache.org/viewvc?rev=1165841&view=rev
Log:
Patch from Robert Handschmann and Peter Kofler to make xbean compile under Java 5 as the pom
indicates it should
XBEAN-185: XBean is not Java 5 compatible
Thanks, Robert and Peter!
Some tweaks by me.

Modified:
    geronimo/xbean/trunk/xbean-blueprint/pom.xml
    geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/cm/JexlPropertyPlaceholder.java
    geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceFinder.java
    geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceHelper.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedClass.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedConstructor.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedField.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedMethod.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedObject.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/UrlSet.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/BundleArchive.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClassesArchive.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/CompositeArchive.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FileArchive.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FilteredArchive.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/JarArchive.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ClassFilter.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ContainsFilter.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ExcludeIncludeFilter.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/FilterList.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filters.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/IncludeExcludeFilter.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PackageFilter.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PatternFilter.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PrefixFilter.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/SuffixFilter.java
    geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/FilteredArchiveTest.java
    geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/MockArchive.java

Modified: geronimo/xbean/trunk/xbean-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/pom.xml?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-blueprint/pom.xml Tue Sep  6 21:02:40 2011
@@ -105,6 +105,13 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

Modified: geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/cm/JexlPropertyPlaceholder.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/cm/JexlPropertyPlaceholder.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/cm/JexlPropertyPlaceholder.java
(original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/cm/JexlPropertyPlaceholder.java
Tue Sep  6 21:02:40 2011
@@ -77,60 +77,48 @@ public class JexlPropertyPlaceholder ext
 
     private class ConfigMap implements Map<String, Object> {
 
-        @Override
         public int size() {
             return 0;
         }
 
-        @Override
         public boolean isEmpty() {
             return false;
         }
 
-        @Override
         public boolean containsKey(Object o) {
             return getProperty((String) o) != null;
         }
 
-        @Override
         public boolean containsValue(Object o) {
             return false;
         }
 
-        @Override
         public Object get(Object o) {
             return getProperty((String) o);
         }
 
-        @Override
         public Object put(String s, Object o) {
             return null;
         }
 
-        @Override
         public Object remove(Object o) {
             return null;
         }
 
-        @Override
         public void putAll(Map<? extends String, ? extends Object> map) {
         }
 
-        @Override
         public void clear() {
         }
 
-        @Override
         public Set<String> keySet() {
             return null;
         }
 
-        @Override
         public Collection<Object> values() {
             return null;
         }
 
-        @Override
         public Set<Entry<String, Object>> entrySet() {
             return null;
         }

Modified: geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceFinder.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceFinder.java
(original)
+++ geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceFinder.java
Tue Sep  6 21:02:40 2011
@@ -209,7 +209,7 @@ public class BundleResourceFinder {
     private static String addSlash(String name) {
         if (name == null ) return "";
         name = name.trim();
-        if (!name.isEmpty() && !name.endsWith("/")) {
+        if (name.length() != 0 && !name.endsWith("/")) {
             name = name + "/";
         }
         return name;

Modified: geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceHelper.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceHelper.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceHelper.java
(original)
+++ geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceHelper.java
Tue Sep  6 21:02:40 2011
@@ -224,7 +224,7 @@ public class BundleResourceHelper {
             }
             return Collections.enumeration(resources);
         } catch (Exception e) {
-            throw new IOException("Error discovering resources", e);
+            throw (IOException) new IOException("Error discovering resources: " + e).initCause(e);
         } finally {
             bundle.getBundleContext().ungetService(reference);
         }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java
Tue Sep  6 21:02:40 2011
@@ -221,7 +221,6 @@ public abstract class AbstractFinder imp
         return classes;
     }
 
-    @Override
     public List<Annotated<Class<?>>> findMetaAnnotatedClasses(Class<?
extends Annotation> annotation) {
         List<Class<?>> classes = findAnnotatedClasses(annotation);
         List<Annotated<Class<?>>> list = new ArrayList<Annotated<Class<?>>>();
@@ -318,7 +317,6 @@ public abstract class AbstractFinder imp
         return methods;
     }
 
-    @Override
     public List<Annotated<Method>> findMetaAnnotatedMethods(Class<? extends
Annotation> annotation) {
         List<Method> methods = findAnnotatedMethods(annotation);
         List<Annotated<Method>> list = new ArrayList<Annotated<Method>>();
@@ -386,7 +384,6 @@ public abstract class AbstractFinder imp
         return fields;
     }
 
-    @Override
     public List<Annotated<Field>> findMetaAnnotatedFields(Class<? extends
Annotation> annotation) {
         List<Field> fields = findAnnotatedFields(annotation);
         List<Annotated<Field>> list = new ArrayList<Annotated<Field>>();

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java
Tue Sep  6 21:02:40 2011
@@ -255,7 +255,6 @@ public class AnnotationFinder implements
         }
     }
 
-    @Override
     public boolean isAnnotationPresent(Class<? extends Annotation> annotation) {
         List<Info> infos = annotated.get(annotation.getName());
         return infos != null && !infos.isEmpty();
@@ -274,12 +273,10 @@ public class AnnotationFinder implements
      *
      * @return an unmodifiable live view of classes that could not be loaded in previous
findAnnotated* call.
      */
-    @Override
     public List<String> getClassesNotLoaded() {
         return Collections.unmodifiableList(classesNotLoaded);
     }
 
-    @Override
     public List<Package> findAnnotatedPackages(Class<? extends Annotation> annotation)
{
         classesNotLoaded.clear();
         List<Package> packages = new ArrayList<Package>();
@@ -301,7 +298,6 @@ public class AnnotationFinder implements
         return packages;
     }
 
-    @Override
     public List<Class<?>> findAnnotatedClasses(Class<? extends Annotation>
annotation) {
         classesNotLoaded.clear();
         List<Class<?>> classes = new ArrayList<Class<?>>();
@@ -323,7 +319,6 @@ public class AnnotationFinder implements
         return classes;
     }
 
-    @Override
     public List<Annotated<Class<?>>> findMetaAnnotatedClasses(Class<?
extends Annotation> annotation) {
         classesNotLoaded.clear();
         Set<Class<?>> classes = findMetaAnnotatedClasses(annotation, new HashSet<Class<?>>());
@@ -385,7 +380,6 @@ public class AnnotationFinder implements
      * @param annotation
      * @return list of directly or indirectly (inherited) annotated classes
      */
-    @Override
     public List<Class<?>> findInheritedAnnotatedClasses(Class<? extends Annotation>
annotation) {
         classesNotLoaded.clear();
         List<Class<?>> classes = new ArrayList<Class<?>>();
@@ -438,7 +432,6 @@ public class AnnotationFinder implements
         return classes;
     }
 
-    @Override
     public List<Method> findAnnotatedMethods(Class<? extends Annotation> annotation)
{
         classesNotLoaded.clear();
         List<ClassInfo> seen = new ArrayList<ClassInfo>();
@@ -468,7 +461,6 @@ public class AnnotationFinder implements
         return methods;
     }
 
-    @Override
     public List<Annotated<Method>> findMetaAnnotatedMethods(Class<? extends
Annotation> annotation) {
         classesNotLoaded.clear();
 
@@ -528,7 +520,6 @@ public class AnnotationFinder implements
         return methods;
     }
 
-    @Override
     public List<Annotated<Field>> findMetaAnnotatedFields(Class<? extends
Annotation> annotation) {
         classesNotLoaded.clear();
 
@@ -588,7 +579,6 @@ public class AnnotationFinder implements
         return fields;
     }
 
-    @Override
     public List<Constructor> findAnnotatedConstructors(Class<? extends Annotation>
annotation) {
         classesNotLoaded.clear();
         List<ClassInfo> seen = new ArrayList<ClassInfo>();
@@ -618,7 +608,6 @@ public class AnnotationFinder implements
         return constructors;
     }
 
-    @Override
     public List<Field> findAnnotatedFields(Class<? extends Annotation> annotation)
{
         classesNotLoaded.clear();
         List<ClassInfo> seen = new ArrayList<ClassInfo>();
@@ -648,7 +637,6 @@ public class AnnotationFinder implements
         return fields;
     }
 
-    @Override
     public List<Class<?>> findClassesInPackage(String packageName, boolean recursive)
{
         classesNotLoaded.clear();
         List<Class<?>> classes = new ArrayList<Class<?>>();
@@ -666,7 +654,6 @@ public class AnnotationFinder implements
         return classes;
     }
 
-    @Override
     public <T> List<Class<? extends T>> findSubclasses(Class<T> clazz)
{
         if (clazz == null) throw new NullPointerException("class cannot be null");
 
@@ -726,7 +713,6 @@ public class AnnotationFinder implements
         return classes;
     }
 
-    @Override
     public <T> List<Class<? extends T>> findImplementations(Class<T>
clazz) {
         if (clazz == null) throw new NullPointerException("class cannot be null");
         if (!clazz.isInterface()) new IllegalArgumentException("class must be an interface");

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedClass.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedClass.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedClass.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedClass.java
Tue Sep  6 21:02:40 2011
@@ -35,7 +35,6 @@ public class MetaAnnotatedClass<T> exten
         super(clazz, unroll(clazz, clazz));
     }
 
-    @Override
     public Annotation[] getDeclaredAnnotations() {
         return target.getDeclaredAnnotations();
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedConstructor.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedConstructor.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedConstructor.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedConstructor.java
Tue Sep  6 21:02:40 2011
@@ -28,62 +28,50 @@ public class MetaAnnotatedConstructor<T>
         super(target, unroll(target.getDeclaringClass(), target));
     }
 
-    @Override
     public Annotation[] getDeclaredAnnotations() {
         return get().getDeclaredAnnotations();
     }
 
-    @Override
     public Annotation[][] getParameterAnnotations() {
         return get().getParameterAnnotations();
     }
 
-    @Override
     public Class<?> getDeclaringClass() {
         return get().getDeclaringClass();
     }
 
-    @Override
     public String getName() {
         return get().getName();
     }
 
-    @Override
     public int getModifiers() {
         return get().getModifiers();
     }
 
-    @Override
     public Class<?>[] getParameterTypes() {
         return get().getParameterTypes();
     }
 
-    @Override
     public java.lang.reflect.Type[] getGenericParameterTypes() {
         return get().getGenericParameterTypes();
     }
 
-    @Override
     public Class<?>[] getExceptionTypes() {
         return get().getExceptionTypes();
     }
 
-    @Override
     public java.lang.reflect.Type[] getGenericExceptionTypes() {
         return get().getGenericExceptionTypes();
     }
 
-    @Override
     public String toGenericString() {
         return get().toGenericString();
     }
 
-    @Override
     public boolean isVarArgs() {
         return get().isVarArgs();
     }
 
-    @Override
     public boolean isSynthetic() {
         return get().isSynthetic();
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedField.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedField.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedField.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedField.java
Tue Sep  6 21:02:40 2011
@@ -28,27 +28,22 @@ public class MetaAnnotatedField extends 
         super(field, unroll(field.getDeclaringClass(), field));
     }
 
-    @Override
     public Annotation[] getDeclaredAnnotations() {
         return get().getDeclaredAnnotations();
     }
 
-    @Override
     public Class<?> getDeclaringClass() {
         return get().getDeclaringClass();
     }
 
-    @Override
     public String getName() {
         return get().getName();
     }
 
-    @Override
     public int getModifiers() {
         return get().getModifiers();
     }
 
-    @Override
     public boolean isSynthetic() {
         return get().isSynthetic();
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedMethod.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedMethod.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedMethod.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedMethod.java
Tue Sep  6 21:02:40 2011
@@ -28,62 +28,50 @@ public class MetaAnnotatedMethod extends
         super(method, unroll(method.getDeclaringClass(), method));
     }
 
-    @Override
     public Annotation[] getDeclaredAnnotations() {
         return target.getDeclaredAnnotations();
     }
 
-    @Override
     public Annotation[][] getParameterAnnotations() {
         return target.getParameterAnnotations();
     }
 
-    @Override
     public Class<?> getDeclaringClass() {
         return target.getDeclaringClass();
     }
 
-    @Override
     public String getName() {
         return target.getName();
     }
 
-    @Override
     public int getModifiers() {
         return target.getModifiers();
     }
 
-    @Override
     public Class<?>[] getParameterTypes() {
         return target.getParameterTypes();
     }
 
-    @Override
     public java.lang.reflect.Type[] getGenericParameterTypes() {
         return target.getGenericParameterTypes();
     }
 
-    @Override
     public Class<?>[] getExceptionTypes() {
         return target.getExceptionTypes();
     }
 
-    @Override
     public java.lang.reflect.Type[] getGenericExceptionTypes() {
         return target.getGenericExceptionTypes();
     }
 
-    @Override
     public String toGenericString() {
         return target.toGenericString();
     }
 
-    @Override
     public boolean isVarArgs() {
         return target.isVarArgs();
     }
 
-    @Override
     public boolean isSynthetic() {
         return target.isSynthetic();
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedObject.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedObject.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedObject.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/MetaAnnotatedObject.java
Tue Sep  6 21:02:40 2011
@@ -44,23 +44,19 @@ public abstract class MetaAnnotatedObjec
         this.annotations.putAll(annotations);
     }
 
-    @Override
     public T get() {
         return target;
     }
 
-    @Override
     public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass)
{
         return annotations.containsKey(annotationClass);
     }
 
-    @Override
     public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
         MetaAnnotation<T> annotation = (MetaAnnotation<T>) annotations.get(annotationClass);
         return (annotation == null) ? null : annotation.get();
     }
 
-    @Override
     public Annotation[] getAnnotations() {
         Annotation[] annotations = new Annotation[this.annotations.size()];
 
@@ -72,7 +68,6 @@ public abstract class MetaAnnotatedObjec
         return annotations;
     }
 
-    @Override
     public Collection<MetaAnnotation<?>> getMetaAnnotations() {
         return Collections.unmodifiableCollection(annotations.values());
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java
Tue Sep  6 21:02:40 2011
@@ -741,9 +741,9 @@ public class ResourceFinder {
      * <p/>
      * Example classpath:
      * <p/>
-     * META-INF/jdbcDrivers/oracle.properties
-     * META-INF/jdbcDrivers/mysql.props
-     * META-INF/jdbcDrivers/derby
+ - META-INF/jdbcDrivers/oracle.properties
+ - META-INF/jdbcDrivers/mysql.props
+ - META-INF/jdbcDrivers/derby
      * <p/>
      * ResourceFinder finder = new ResourceFinder("META-INF/");
      * List<Properties> driversList = finder.findAvailableProperties("jdbcDrivers");

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/UrlSet.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/UrlSet.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/UrlSet.java (original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/UrlSet.java Tue
Sep  6 21:02:40 2011
@@ -196,7 +196,6 @@ public class UrlSet implements Iterable<
         return urls.size();
     }
 
-    @Override
     public Iterator<URL> iterator() {
         return getUrls().iterator();
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/BundleArchive.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/BundleArchive.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/BundleArchive.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/BundleArchive.java
Tue Sep  6 21:02:40 2011
@@ -46,13 +46,11 @@ public class BundleArchive implements Ar
         bundleResourceFinder.find(new AnnotationFindingCallback());
     }
 
-    @Override
     public Iterator<String> iterator() {
         // TODO
         return Collections.EMPTY_LIST.iterator();
     }
 
-    @Override
     public InputStream getBytecode(String className) throws IOException, ClassNotFoundException
{
         int pos = className.indexOf("<");
         if (pos > -1) {
@@ -72,7 +70,6 @@ public class BundleArchive implements Ar
         throw new ClassNotFoundException(className);
     }
 
-    @Override
     public Class<?> loadClass(String s) throws ClassNotFoundException {
         return bundle.loadClass(s);
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClassesArchive.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClassesArchive.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClassesArchive.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClassesArchive.java
Tue Sep  6 21:02:40 2011
@@ -49,12 +49,10 @@ public class ClassesArchive implements A
         }
     }
 
-    @Override
     public Iterator<String> iterator() {
         return classes.keySet().iterator();
     }
 
-    @Override
     public InputStream getBytecode(String className) throws IOException, ClassNotFoundException
{
         assert className != null;
 
@@ -77,7 +75,6 @@ public class ClassesArchive implements A
         throw new ClassNotFoundException(className);
     }
 
-    @Override
     public Class<?> loadClass(String className) throws ClassNotFoundException {
         Class<?> clazz = classes.get(className);
         if (clazz != null) return clazz;

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/CompositeArchive.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/CompositeArchive.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/CompositeArchive.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/CompositeArchive.java
Tue Sep  6 21:02:40 2011
@@ -41,7 +41,6 @@ public class CompositeArchive implements
         }
     }
 
-    @Override
     public InputStream getBytecode(String className) throws IOException, ClassNotFoundException
{
         for (Archive archive : archives) {
             try {
@@ -53,7 +52,6 @@ public class CompositeArchive implements
         throw new ClassNotFoundException(className);
     }
 
-    @Override
     public Class<?> loadClass(String className) throws ClassNotFoundException {
         for (Archive archive : archives) {
             try {
@@ -65,7 +63,6 @@ public class CompositeArchive implements
         throw new ClassNotFoundException(className);
     }
 
-    @Override
     public Iterator<String> iterator() {
         return new CompositeIterator(archives);
     }
@@ -82,7 +79,6 @@ public class CompositeArchive implements
             }
         }
 
-        @Override
         public boolean hasNext() {
             if (current == null) return false;
             if (current.hasNext()) return true;
@@ -94,14 +90,12 @@ public class CompositeArchive implements
             return false;
         }
 
-        @Override
         public String next() {
             if (!hasNext()) throw new NoSuchElementException();
 
             return current.next();
         }
 
-        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FileArchive.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FileArchive.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FileArchive.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FileArchive.java
Tue Sep  6 21:02:40 2011
@@ -43,7 +43,6 @@ public class FileArchive implements Arch
         this.dir = dir;
     }
 
-    @Override
     public InputStream getBytecode(String className) throws IOException, ClassNotFoundException
{
         int pos = className.indexOf("<");
         if (pos > -1) {
@@ -64,12 +63,10 @@ public class FileArchive implements Arch
     }
 
 
-    @Override
     public Class<?> loadClass(String className) throws ClassNotFoundException {
         return loader.loadClass(className);
     }
 
-    @Override
     public Iterator<String> iterator() {
         return file(dir).iterator();
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FilteredArchive.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FilteredArchive.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FilteredArchive.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FilteredArchive.java
Tue Sep  6 21:02:40 2011
@@ -37,17 +37,14 @@ public class FilteredArchive implements 
         this.filter = filter;
     }
 
-    @Override
     public InputStream getBytecode(String className) throws IOException, ClassNotFoundException
{
         return archive.getBytecode(className);
     }
 
-    @Override
     public Class<?> loadClass(String className) throws ClassNotFoundException {
         return archive.loadClass(className);
     }
 
-    @Override
     public Iterator<String> iterator() {
         return new FilteredIterator(archive.iterator());
     }
@@ -61,7 +58,6 @@ public class FilteredArchive implements 
             this.it = it;
         }
 
-        @Override
         public boolean hasNext() {
             if (next != null) return true;
             if (!it.hasNext()) return false;
@@ -69,7 +65,6 @@ public class FilteredArchive implements 
             return hasNext();
         }
 
-        @Override
         public String next() {
             if (!hasNext()) throw new NoSuchElementException();
 
@@ -79,7 +74,6 @@ public class FilteredArchive implements 
             return s;
         }
 
-        @Override
         public void remove() {
             it.remove();
         }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/JarArchive.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/JarArchive.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/JarArchive.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/JarArchive.java
Tue Sep  6 21:02:40 2011
@@ -42,7 +42,6 @@ public class JarArchive implements Archi
         this.url = url;
     }
 
-    @Override
     public InputStream getBytecode(String className) throws IOException, ClassNotFoundException
{
         int pos = className.indexOf("<");
         if (pos > -1) {
@@ -63,12 +62,10 @@ public class JarArchive implements Archi
     }
 
 
-    @Override
     public Class<?> loadClass(String className) throws ClassNotFoundException {
         return loader.loadClass(className);
     }
 
-    @Override
     public Iterator<String> iterator() {
         try {
             return jar(url).iterator();

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ClassFilter.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ClassFilter.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ClassFilter.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ClassFilter.java
Tue Sep  6 21:02:40 2011
@@ -32,7 +32,6 @@ public class ClassFilter implements Filt
         return name;
     }
 
-    @Override
     public boolean accept(String name) {
         return this.name.equals(name);
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ContainsFilter.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ContainsFilter.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ContainsFilter.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ContainsFilter.java
Tue Sep  6 21:02:40 2011
@@ -32,7 +32,6 @@ public class ContainsFilter implements F
         return token;
     }
 
-    @Override
     public boolean accept(String name) {
         return name.contains(token);
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ExcludeIncludeFilter.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ExcludeIncludeFilter.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ExcludeIncludeFilter.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ExcludeIncludeFilter.java
Tue Sep  6 21:02:40 2011
@@ -30,7 +30,6 @@ public class ExcludeIncludeFilter implem
         this.exclude = exclude;
     }
 
-    @Override
     public boolean accept(String name) {
         if (exclude.accept(name)) return include.accept(name);
         return true;

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/FilterList.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/FilterList.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/FilterList.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/FilterList.java
Tue Sep  6 21:02:40 2011
@@ -37,7 +37,6 @@ public class FilterList implements Filte
         }
     }
 
-    @Override
     public boolean accept(String name) {
         for (Filter filter : filters) {
             if (filter.accept(name)) return true;

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filters.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filters.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filters.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filters.java
Tue Sep  6 21:02:40 2011
@@ -28,7 +28,6 @@ import java.util.Set;
  */
 public class Filters {
     private static final Filter NONE = new Filter() {
-        @Override
         public boolean accept(String name) {
             return false;
         }
@@ -151,7 +150,6 @@ public class Filters {
             this.filter = filter;
         }
 
-        @Override
         public boolean accept(String name) {
             return !filter.accept(name);
         }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/IncludeExcludeFilter.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/IncludeExcludeFilter.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/IncludeExcludeFilter.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/IncludeExcludeFilter.java
Tue Sep  6 21:02:40 2011
@@ -31,7 +31,6 @@ public class IncludeExcludeFilter implem
         this.exclude = exclude;
     }
 
-    @Override
     public boolean accept(String name) {
         if (include.accept(name)) return !exclude.accept(name);
         return false;

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PackageFilter.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PackageFilter.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PackageFilter.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PackageFilter.java
Tue Sep  6 21:02:40 2011
@@ -33,7 +33,6 @@ public class PackageFilter implements Fi
         return packageName;
     }
 
-    @Override
     public boolean accept(String name) {
         return name.startsWith(packageName);
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PatternFilter.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PatternFilter.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PatternFilter.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PatternFilter.java
Tue Sep  6 21:02:40 2011
@@ -38,7 +38,6 @@ public class PatternFilter implements Fi
         return pattern;
     }
 
-    @Override
     public boolean accept(String name) {
         return pattern.matcher(name).matches();
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PrefixFilter.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PrefixFilter.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PrefixFilter.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PrefixFilter.java
Tue Sep  6 21:02:40 2011
@@ -32,7 +32,6 @@ public class PrefixFilter implements Fil
         return prefix;
     }
 
-    @Override
     public boolean accept(String name) {
         return name.startsWith(prefix);
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/SuffixFilter.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/SuffixFilter.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/SuffixFilter.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/SuffixFilter.java
Tue Sep  6 21:02:40 2011
@@ -32,7 +32,6 @@ public class SuffixFilter implements Fil
         return suffix;
     }
 
-    @Override
     public boolean accept(String name) {
         return name.endsWith(suffix);
     }

Modified: geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/FilteredArchiveTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/FilteredArchiveTest.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/FilteredArchiveTest.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/FilteredArchiveTest.java
Tue Sep  6 21:02:40 2011
@@ -64,7 +64,6 @@ public class FilteredArchiveTest extends
 
     public static class Nothing implements Filter {
 
-        @Override
         public boolean accept(String name) {
             return true;
         }
@@ -72,7 +71,6 @@ public class FilteredArchiveTest extends
 
     public static class All implements Filter {
 
-        @Override
         public boolean accept(String name) {
             return false;
         }
@@ -82,7 +80,6 @@ public class FilteredArchiveTest extends
 
         private boolean accept;
 
-        @Override
         public boolean accept(String name) {
             return accept = !accept;
         }

Modified: geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/MockArchive.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/MockArchive.java?rev=1165841&r1=1165840&r2=1165841&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/MockArchive.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/MockArchive.java
Tue Sep  6 21:02:40 2011
@@ -41,17 +41,14 @@ public class MockArchive implements Arch
         }
     }
 
-    @Override
     public InputStream getBytecode(String className) throws IOException, ClassNotFoundException
{
         return null;
     }
 
-    @Override
     public Class<?> loadClass(String className) throws ClassNotFoundException {
         return null;
     }
 
-    @Override
     public Iterator<String> iterator() {
         return list.iterator();
     }



Mime
View raw message