This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch experimental in repository bnd.
commit b14c4421c978308de94aa0ca6f215c8474b2522a Author: Markus Koschany <[email protected]> Date: Fri May 15 15:04:27 2015 +0200 Add FTBFS.patch --- debian/patches/FTBFS.patch | 338 +++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 339 insertions(+) diff --git a/debian/patches/FTBFS.patch b/debian/patches/FTBFS.patch new file mode 100644 index 0000000..6a3e463 --- /dev/null +++ b/debian/patches/FTBFS.patch @@ -0,0 +1,338 @@ +From: Markus Koschany <[email protected]> +Date: Fri, 15 May 2015 15:04:06 +0200 +Subject: FTBFS + +--- + .../src/aQute/launcher/minifw/Context.java | 99 +++++++++++++++------- + .../src/aQute/launcher/minifw/MiniFramework.java | 74 ++++++++++++---- + 2 files changed, 126 insertions(+), 47 deletions(-) + +diff --git a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java +index 3761a8a..8c5111f 100644 +--- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java ++++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java +@@ -2,6 +2,7 @@ package aQute.launcher.minifw; + + import java.io.*; + import java.net.*; ++import java.security.cert.*; + import java.util.*; + import java.util.jar.*; + import java.util.zip.*; +@@ -18,16 +19,19 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu + private TreeSet<String> paths; + private File jarFile; + +- class Dict extends Dictionary<String,Object> { ++ class Dict extends Dictionary<String,String> { + + @Override +- public Enumeration<Object> elements() { +- return Collections.enumeration(manifest.getMainAttributes().values()); ++ public Enumeration<String> elements() { ++ @SuppressWarnings("unchecked") ++ Enumeration<String> enumeration = (Enumeration) Collections.enumeration(manifest ++ .getMainAttributes().values()); ++ return enumeration; + } + + @Override +- public Object get(Object key) { +- Object o = manifest.getMainAttributes().getValue((String) key); ++ public String get(Object key) { ++ String o = manifest.getMainAttributes().getValue((String) key); + return o; + } + +@@ -47,12 +51,12 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu + } + + @Override +- public Object put(String key, Object value) { ++ public String put(String key, String value) { + throw new UnsupportedOperationException(); + } + + @Override +- public Object remove(Object key) { ++ public String remove(Object key) { + throw new UnsupportedOperationException(); + } + +@@ -94,15 +98,15 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu + return getResource(path); + } + +- public Enumeration< ? > getEntryPaths(String path) { ++ public Enumeration<String> getEntryPaths(String path) { + throw new UnsupportedOperationException(); + } + +- public Dictionary<String,Object> getHeaders() { ++ public Dictionary<String,String> getHeaders() { + return new Dict(); + } + +- public Dictionary<String,Object> getHeaders(String locale) { ++ public Dictionary<String,String> getHeaders(String locale) { + return new Dict(); + } + +@@ -186,7 +190,7 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu + return null; + } + +- public Map< ? , ? > getSignerCertificates(int signersType) { ++ public Map<X509Certificate,List<X509Certificate>> getSignerCertificates(int signersType) { + throw new UnsupportedOperationException(); + } + +@@ -195,11 +199,11 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu + } + + public String getSymbolicName() { +- return ((String) getHeaders().get("Bundle-SymbolicName")).trim(); ++ return getHeaders().get(aQute.bnd.osgi.Constants.BUNDLE_SYMBOLICNAME).trim(); + } + + public Version getVersion() { +- String v = ((String) getHeaders().get("Bundle-Version")).trim(); ++ String v = getHeaders().get(aQute.bnd.osgi.Constants.BUNDLE_VERSION).trim(); + if (v == null) + return new Version("0"); + return new Version(v); +@@ -281,15 +285,12 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu + return fw.getProperty(key); + } + +- public Object getService(ServiceReference reference) { +- throw new UnsupportedOperationException(); +- } + +- public ServiceReference getServiceReference(String clazz) { ++ public ServiceReference<?> getServiceReference(String clazz) { + return null; + } + +- public ServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException { ++ public ServiceReference<?>[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException { + return null; + } + +@@ -301,13 +302,6 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu + return fw.installBundle(location, input); + } + +- public ServiceRegistration registerService(String[] clazzes, Object service, Dictionary properties) { +- throw new UnsupportedOperationException(); +- } +- +- public ServiceRegistration registerService(String clazz, Object service, Dictionary properties) { +- throw new UnsupportedOperationException(); +- } + + public void removeBundleListener(BundleListener listener) { + throw new UnsupportedOperationException(); +@@ -321,12 +315,59 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu + throw new UnsupportedOperationException(); + } + +- public boolean ungetService(ServiceReference reference) { +- throw new UnsupportedOperationException(); +- } +- + @Override + public String toString() { + return id + " " + location; + } ++ ++ public int compareTo(Bundle var0) { ++ // TODO Auto-generated method stub ++ return 0; ++ } ++ ++ public ServiceRegistration< ? > registerService(String[] clazzes, Object service, Dictionary<String, ? > properties) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public ServiceRegistration< ? > registerService(String clazz, Object service, Dictionary<String, ? > properties) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ? > properties) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) ++ throws InvalidSyntaxException { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public <S> S getService(ServiceReference<S> reference) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public boolean ungetService(ServiceReference< ? > reference) { ++ // TODO Auto-generated method stub ++ return false; ++ } ++ ++ public Bundle getBundle(String location) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public <A> A adapt(Class<A> type) { ++ // TODO Auto-generated method stub ++ return null; ++ } + } +diff --git a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java +index 7d910c5..67e9348 100644 +--- a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java ++++ b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java +@@ -2,6 +2,7 @@ package aQute.launcher.minifw; + + import java.io.*; + import java.net.*; ++import java.security.cert.*; + import java.util.*; + + import org.osgi.framework.*; +@@ -55,7 +56,7 @@ public class MiniFramework implements Framework, Bundle, BundleContext { + return loader.getResource(path); + } + +- public Enumeration< ? > getEntryPaths(String path) { ++ public Enumeration< String > getEntryPaths(String path) { + throw new UnsupportedOperationException(); + } + +@@ -63,7 +64,7 @@ public class MiniFramework implements Framework, Bundle, BundleContext { + return new Hashtable<String,String>(); + } + +- public Dictionary< ? , ? > getHeaders(String locale) { ++ public Dictionary< String , String > getHeaders(String locale) { + throw new UnsupportedOperationException(); + } + +@@ -180,7 +181,7 @@ public class MiniFramework implements Framework, Bundle, BundleContext { + } + } + +- public Enumeration< ? > findEntries(String path, String filePattern, boolean recurse) { ++ public Enumeration<URL> findEntries(String path, String filePattern, boolean recurse) { + throw new UnsupportedOperationException(); + } + +@@ -192,7 +193,7 @@ public class MiniFramework implements Framework, Bundle, BundleContext { + throw new UnsupportedOperationException(); + } + +- public Map< ? , ? > getSignerCertificates(int signersType) { ++ public Map<X509Certificate,List<X509Certificate>> getSignerCertificates(int signersType) { + throw new UnsupportedOperationException(); + } + +@@ -232,9 +233,6 @@ public class MiniFramework implements Framework, Bundle, BundleContext { + throw new UnsupportedOperationException(); + } + +- public Object getService(ServiceReference reference) { +- return null; +- } + + public ServiceReference getServiceReference(String clazz) { + return null; +@@ -244,13 +242,6 @@ public class MiniFramework implements Framework, Bundle, BundleContext { + return null; + } + +- public ServiceRegistration registerService(String[] clazzes, Object service, Dictionary properties) { +- throw new UnsupportedOperationException(); +- } +- +- public ServiceRegistration registerService(String clazz, Object service, Dictionary properties) { +- throw new UnsupportedOperationException(); +- } + + public void removeBundleListener(BundleListener listener) { + // ok +@@ -264,10 +255,6 @@ public class MiniFramework implements Framework, Bundle, BundleContext { + // ok + } + +- public boolean ungetService(ServiceReference reference) { +- throw new UnsupportedOperationException(); +- } +- + @Override + public String toString() { + return "Mini framework"; +@@ -287,4 +274,55 @@ public class MiniFramework implements Framework, Bundle, BundleContext { + throw new ClassNotFoundException(name); + } + } ++ ++ public int compareTo(Bundle var0) { ++ // TODO Auto-generated method stub ++ return 0; ++ } ++ ++ public ServiceRegistration< ? > registerService(String[] clazzes, Object service, Dictionary<String, ? > properties) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public ServiceRegistration< ? > registerService(String clazz, Object service, Dictionary<String, ? > properties) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ? > properties) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) ++ throws InvalidSyntaxException { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public <S> S getService(ServiceReference<S> reference) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public boolean ungetService(ServiceReference< ? > reference) { ++ // TODO Auto-generated method stub ++ return false; ++ } ++ ++ public Bundle getBundle(String location) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public <A> A adapt(Class<A> type) { ++ // TODO Auto-generated method stub ++ return null; ++ } + } diff --git a/debian/patches/series b/debian/patches/series index 91d0592..bcea885 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ no-osgi.r5.patch ant-contrib.patch findbugs.patch embedded-repo.patch +FTBFS.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
