Author: ckoppelt
Date: Wed Nov 21 22:09:15 2012
New Revision: 1412329
URL: http://svn.apache.org/viewvc?rev=1412329&view=rev
Log:
fix for the Java7 build problems from ABDERA-311
Modified:
abdera/java/trunk/core/src/main/java/org/apache/abdera/util/Discover.java
abdera/java/trunk/pom.xml
Modified:
abdera/java/trunk/core/src/main/java/org/apache/abdera/util/Discover.java
URL:
http://svn.apache.org/viewvc/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/Discover.java?rev=1412329&r1=1412328&r2=1412329&view=diff
==============================================================================
--- abdera/java/trunk/core/src/main/java/org/apache/abdera/util/Discover.java
(original)
+++ abdera/java/trunk/core/src/main/java/org/apache/abdera/util/Discover.java
Wed Nov 21 22:09:15 2012
@@ -47,13 +47,17 @@ public final class Discover {
}
public static <T> Iterable<T> locate(String id, boolean classesonly,
ClassLoader cl, Object... args) {
- return locate(id, classesonly, new DefaultLoader<T>(id, classesonly,
args, cl));
+ return locate(id, new DefaultLoader<T>(id, classesonly, args, cl));
}
public static <T> Iterable<T> locate(String id, Object... args) {
return locate(id, false, args);
}
+ public static <T> Iterable<T> locate(String id, boolean classesonly) {
+ return locate(id, new DefaultLoader<T>(id, classesonly, null));
+ }
+
public static <T> Iterable<T> locate(String id, boolean classesonly,
Object... args) {
return locate(id, new DefaultLoader<T>(id, classesonly, args));
}
Modified: abdera/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/abdera/java/trunk/pom.xml?rev=1412329&r1=1412328&r2=1412329&view=diff
==============================================================================
--- abdera/java/trunk/pom.xml (original)
+++ abdera/java/trunk/pom.xml Wed Nov 21 22:09:15 2012
@@ -503,7 +503,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jetty.version>6.1.24</jetty.version>
+ <jetty.version>6.1.26</jetty.version>
<easymock.version>3.0</easymock.version>
<topDir>${basedir}</topDir>
<abdera.osgi.imports>${abdera.osgi.abdera.imports},${abdera.osgi.default.imports}</abdera.osgi.imports>
