diff --git a/java-jfree-libloader-1.1.3-01-common_build_xml.patch b/java-jfree-libloader-1.1.3-01-common_build_xml.patch deleted file mode 100644 index 6afb890..0000000 --- a/java-jfree-libloader-1.1.3-01-common_build_xml.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- common_build.xml 2009-11-16 10:25:34.000000000 +0100 -+++ common_build.xml-gil 2011-01-22 14:12:08.000000000 +0100 -@@ -1071,6 +1071,7 @@ - - - -+ - - - -@@ -1356,6 +1357,9 @@ - doctitle="${impl.title} documentation"> - - -+ -+ -+ - - - diff --git a/java-jfree-libloader-1.1.3-build.patch b/java-jfree-libloader-1.1.3-build.patch new file mode 100644 index 0000000..e1e5041 --- /dev/null +++ b/java-jfree-libloader-1.1.3-build.patch @@ -0,0 +1,44 @@ +--- libloader-1.1.3/build.properties 2009-11-17 14:12:00.000000000 +0000 ++++ libloader-1.1.3/build.properties 2009-11-17 14:12:48.000000000 +0000 +@@ -1,4 +1,4 @@ +-project.revision=TRUNK-SNAPSHOT ++project.revision=1.1.3 + ivy.artifact.group=pentaho-library + ivy.artifact.id=libloader + impl.title=LibLoader +@@ -6,4 +6,6 @@ + src.dir=${basedir}/source + dependency.libbase.revision=1.1.3 + dependency.libpixie.revision=1.1.3 +-testsrc.dir=${basedir}/test +\ No newline at end of file ++testsrc.dir=${basedir}/test ++antcontrib.available=true ++build.cache.dir=lib +--- libloader-1.1.3/common_build.xml 2009-11-17 14:55:31.000000000 +0000 ++++ libloader-1.1.3/common_build.xml 2009-11-17 14:56:48.000000000 +0000 +@@ -1071,6 +1071,7 @@ + + + ++ + + + +@@ -1356,6 +1357,9 @@ + doctitle="${impl.title} documentation"> + + ++ ++ ++ + + + +@@ -1648,4 +1652,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/java-jfree-libloader-1.1.3-build_properties.patch b/java-jfree-libloader-1.1.3-build_properties.patch deleted file mode 100644 index 988f9d8..0000000 --- a/java-jfree-libloader-1.1.3-build_properties.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- build.properties 2009-11-16 10:25:34.000000000 +0100 -+++ build.properties-gil 2011-01-22 13:50:48.000000000 +0100 -@@ -1,4 +1,4 @@ --project.revision=TRUNK-SNAPSHOT -+project.revision=1.1.3 - ivy.artifact.group=pentaho-library - ivy.artifact.id=libloader - impl.title=LibLoader -@@ -6,4 +6,6 @@ - src.dir=${basedir}/source - dependency.libbase.revision=1.1.3 - dependency.libpixie.revision=1.1.3 --testsrc.dir=${basedir}/test -\ Manca newline alla fine del file -+testsrc.dir=${basedir}/test -+antcontrib.available=true -+build.cache.dir=lib -\ Manca newline alla fine del file diff --git a/java-jfree-libloader-1.1.3-common_build_xml.patch b/java-jfree-libloader-1.1.3-common_build_xml.patch deleted file mode 100644 index 4c921d1..0000000 --- a/java-jfree-libloader-1.1.3-common_build_xml.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- common_build.xml 2009-11-16 10:25:34.000000000 +0100 -+++ common_build.xml-gil 2011-01-22 13:54:13.000000000 +0100 -@@ -1071,6 +1071,7 @@ - - - -+ - - - -@@ -1356,6 +1357,9 @@ - doctitle="${impl.title} documentation"> - - -+ -+ -+ - - - diff --git a/java-jfree-libloader-1.1.3-java11.patch b/java-jfree-libloader-1.1.3-java11.patch new file mode 100644 index 0000000..6e8b201 --- /dev/null +++ b/java-jfree-libloader-1.1.3-java11.patch @@ -0,0 +1,28 @@ +--- libloader-1.1.3/common_build.xml 2020-05-05 19:56:04.431079128 +0100 ++++ libloader-1.1.3/common_build.xml 2020-05-05 19:56:16.062171410 +0100 +@@ -136,8 +136,8 @@ + +- +- ++ ++ + + + + + +- +- +- + + + diff --git a/java-jfree-libloader-1.1.3-remove-antcontrib-support.patch b/java-jfree-libloader-1.1.3-remove-antcontrib-support.patch new file mode 100644 index 0000000..1296ac8 --- /dev/null +++ b/java-jfree-libloader-1.1.3-remove-antcontrib-support.patch @@ -0,0 +1,224 @@ +diff --git a/common_build.xml b/common_build.xml +index d9fe4b6..4eb9f28 100644 +--- a/common_build.xml ++++ b/common_build.xml +@@ -152,9 +152,6 @@ + +- + +@@ -324,69 +321,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + ++ depends="svnant.download-check"> + + + +@@ -492,57 +426,12 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + ++ depends="ivy.download-check"> + + + +@@ -602,7 +491,7 @@ + Verifies that there are no SNAPSHOT dependencies defined in the ivy xml. + If there are SNAPSHOTS, fail the release build. + ====================================================================--> +- ++ + + + +@@ -769,7 +658,7 @@ + Publishes the jar file for this project to a Maven2 repository. + ====================================================================--> + ++ depends="create-pom,ivy.deliver"> + + + +@@ -1079,30 +968,12 @@ + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ + + + +@@ -1152,7 +1023,7 @@ + + Creates a jar file from the bin directory + ====================================================================--> +- ++ + + + +@@ -1165,7 +1036,7 @@ + Creates a new manifest file if one is not specified, or updates + an existing manifest file if one is specified. + ====================================================================--> +- ++ + + + diff --git a/java-jfree-libloader-1.1.3-remove-commons-logging.patch b/java-jfree-libloader-1.1.3-remove-commons-logging.patch new file mode 100644 index 0000000..a66137f --- /dev/null +++ b/java-jfree-libloader-1.1.3-remove-commons-logging.patch @@ -0,0 +1,515 @@ +diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/DefaultResourceManagerBackend.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/DefaultResourceManagerBackend.java +--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/DefaultResourceManagerBackend.java 2021-04-07 10:55:58.343147414 +0100 ++++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/DefaultResourceManagerBackend.java 2021-04-07 11:08:48.389599751 +0100 +@@ -22,8 +22,8 @@ + import java.util.Iterator; + import java.util.Map; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Level; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.base.config.Configuration; + import org.pentaho.reporting.libraries.base.util.ObjectUtilities; + +@@ -34,7 +34,7 @@ + */ + public class DefaultResourceManagerBackend implements ResourceManagerBackend + { +- private static final Log logger = LogFactory.getLog(DefaultResourceManagerBackend.class); ++ private static final Logger logger = Logger.getLogger(DefaultResourceManagerBackend.class.getName()); + + private ArrayList resourceLoaders; + private ArrayList resourceBundleLoaders; +@@ -280,9 +280,9 @@ + { + // ignore it, try the next factory ... + exception = rex; +- if (logger.isDebugEnabled()) ++ if (logger.isLoggable(Level.CONFIG)) + { +- logger.debug("Failed at " + fact.getClass() + ": ", rex); ++ logger.config("Failed at " + fact.getClass() + ": " + rex); + } + } + } +@@ -413,7 +413,7 @@ + { + throw new UnrecognizedLoaderException("Invalid key: No resource-loader registered for schema: " + key.getSchema()); + } +- logger.debug("Loaded " + key); ++ logger.config("Loaded " + key); + return loader.load(key); + } + +@@ -451,7 +451,7 @@ + ResourceLoader.class); + if (loader != null) + { +- //Log.debug("Registering loader for " + loader.getSchema()); ++ //Log.config("Registering loader for " + loader.getSchema()); + registerLoader(loader); + } + } +@@ -465,7 +465,7 @@ + ResourceManager.class, ResourceBundleLoader.class); + if (loader != null) + { +- //Log.debug("Registering loader for " + loader.getSchema()); ++ //Log.config("Registering loader for " + loader.getSchema()); + registerBundleLoader(loader); + } + } +diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/factory/drawable/DrawableWrapper.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/factory/drawable/DrawableWrapper.java +--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/factory/drawable/DrawableWrapper.java 2021-04-07 10:55:58.342147402 +0100 ++++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/factory/drawable/DrawableWrapper.java 2021-04-07 11:05:40.206289803 +0100 +@@ -27,8 +27,8 @@ + import java.util.Collections; + import java.util.Map; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Level; ++import java.util.logging.Logger; + + /** + * Creation-Date: 05.12.2007, 19:15:56 +@@ -37,7 +37,7 @@ + */ + public class DrawableWrapper + { +- private static final Log logger = LogFactory.getLog(DrawableWrapper.class); ++ private static final Logger logger = Logger.getLogger(DrawableWrapper.class.getName()); + private static final Map drawables = Collections.synchronizedMap(new HashMap()); + + private Object backend; +@@ -67,9 +67,9 @@ + Modifier.isAbstract(modifiers) || + Modifier.isStatic(modifiers)) + { +- if (logger.isWarnEnabled()) ++ if (logger.isLoggable(Level.WARNING)) + { +- logger.warn("DrawMethod is not valid: " + aClass + '#' + drawMethod); ++ logger.warning("DrawMethod is not valid: " + aClass + '#' + drawMethod); + } + drawMethod = null; + } +@@ -77,9 +77,9 @@ + catch (NoSuchMethodException e) + { + // ignore exception +- if (logger.isWarnEnabled()) ++ if (logger.isLoggable(Level.WARNING)) + { +- logger.warn("The object is not a drawable: " + aClass); ++ logger.warning("The object is not a drawable: " + aClass); + } + drawMethod = null; + } +@@ -141,9 +141,9 @@ + } + catch (Exception e) + { +- if (logger.isDebugEnabled()) ++ if (logger.isLoggable(Level.CONFIG)) + { +- logger.warn("Invoking draw failed:", e); ++ logger.warning("Invoking draw failed: " + e); + } + } + } +@@ -167,9 +167,9 @@ + } + catch (Exception e) + { +- if (logger.isWarnEnabled()) ++ if (logger.isLoggable(Level.WARNING)) + { +- logger.warn("Invoking getPreferredSize failed:", e); ++ logger.warning("Invoking getPreferredSize failed: " + e); + } + return null; + } +@@ -193,9 +193,9 @@ + } + catch (Exception e) + { +- if (logger.isWarnEnabled()) ++ if (logger.isLoggable(Level.WARNING)) + { +- logger.warn("Invoking isKeepAspectRatio failed:", e); ++ logger.warning("Invoking isKeepAspectRatio failed: " + e); + } + return false; + } +diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java +--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java 2021-04-07 10:55:58.344147426 +0100 ++++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java 2021-04-07 11:03:22.711602044 +0100 +@@ -24,8 +24,7 @@ + import java.util.HashMap; + import java.util.Map; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.resourceloader.ResourceData; + import org.pentaho.reporting.libraries.resourceloader.ResourceKey; + import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException; +@@ -43,7 +42,7 @@ + public class FileResourceLoader implements ResourceLoader + { + public static final String SCHEMA_NAME = FileResourceLoader.class.getName(); +- private static final Log logger = LogFactory.getLog(FileResourceLoader.class); ++ private static final Logger logger = Logger.getLogger(FileResourceLoader.class.getName()); + + public FileResourceLoader() + { +@@ -210,7 +209,7 @@ + } + + // Log information +- logger.debug("Serializing a File Resource Key..."); ++ logger.config("Serializing a File Resource Key..."); + if (key.getParent() != null) + { + throw new ResourceException +@@ -224,7 +223,7 @@ + final String strIdentifier = file.getCanonicalPath(); + final String result = ResourceKeyUtils.createStringResourceKey + (key.getSchema().toString(), strIdentifier, key.getFactoryParameters()); +- logger.debug("Serialized File Resource Key: [" + result + "]"); ++ logger.config("Serialized File Resource Key: [" + result + "]"); + return result; + } + catch (IOException ioe) +diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/raw/RawResourceLoader.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/raw/RawResourceLoader.java +--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/raw/RawResourceLoader.java 2021-04-07 10:55:58.343147414 +0100 ++++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/raw/RawResourceLoader.java 2021-04-07 11:01:56.064538444 +0100 +@@ -21,8 +21,7 @@ + import java.util.HashMap; + import java.util.Map; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.resourceloader.ResourceData; + import org.pentaho.reporting.libraries.resourceloader.ResourceException; + import org.pentaho.reporting.libraries.resourceloader.ResourceKey; +diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/resource/ClassloaderResourceLoader.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/resource/ClassloaderResourceLoader.java +--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/resource/ClassloaderResourceLoader.java 2021-04-07 10:55:58.343147414 +0100 ++++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/resource/ClassloaderResourceLoader.java 2021-04-07 11:03:14.370499656 +0100 +@@ -21,8 +21,7 @@ + import java.util.Map; + import java.net.URL; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.resourceloader.ResourceData; + import org.pentaho.reporting.libraries.resourceloader.ResourceKey; + import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException; +@@ -41,7 +40,7 @@ + public class ClassloaderResourceLoader implements ResourceLoader + { + public static final String SCHEMA_NAME = ClassloaderResourceLoader.class.getName(); +- private static final Log logger = LogFactory.getLog(ClassloaderResourceLoader.class); ++ private static final Logger logger = Logger.getLogger(ClassloaderResourceLoader.class.getName()); + + public ClassloaderResourceLoader() + { +@@ -197,7 +196,7 @@ + } + + // Log information +- logger.debug("Serializing a Classloader Resource Key..."); ++ logger.config("Serializing a Classloader Resource Key..."); + if (key.getParent() != null) + { + throw new ResourceException +@@ -207,7 +206,7 @@ + // Serialize the key + final String result = ResourceKeyUtils.createStringResourceKey(key.getSchema().toString(), + (String) key.getIdentifier(), key.getFactoryParameters()); +- logger.debug("Serialized Classloader Resource Key: [" + result + "]"); ++ logger.config("Serialized Classloader Resource Key: [" + result + "]"); + return result; + } + +diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/URLResourceLoader.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/URLResourceLoader.java +--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/URLResourceLoader.java 2021-04-07 10:55:58.344147426 +0100 ++++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/URLResourceLoader.java 2021-04-07 11:03:41.998838804 +0100 +@@ -22,8 +22,7 @@ + import java.util.HashMap; + import java.util.Map; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.resourceloader.ResourceData; + import org.pentaho.reporting.libraries.resourceloader.ResourceKey; + import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException; +@@ -40,7 +39,7 @@ + public class URLResourceLoader implements ResourceLoader + { + public static final String SCHEMA_NAME = URLResourceLoader.class.getName(); +- private static final Log logger = LogFactory.getLog(URLResourceLoader.class); ++ private static final Logger logger = Logger.getLogger(URLResourceLoader.class.getName()); + + public URLResourceLoader() + { +@@ -188,10 +187,10 @@ + } + + // Log information +- logger.debug("Serializing a Classloader Resource Key..."); ++ logger.config("Serializing a Classloader Resource Key..."); + if (key.getParent() != null) + { +- logger.warn("Serializing a Classloader Resource Key which contains a parent: key=[" + bundleKey + "] parent=[" ++ logger.warning("Serializing a Classloader Resource Key which contains a parent: key=[" + bundleKey + "] parent=[" + + key.getParent() + "]"); + } + +@@ -199,7 +198,7 @@ + final URL url = (URL) key.getIdentifier(); + final String result = ResourceKeyUtils.createStringResourceKey + (key.getSchema().toString(), url.toExternalForm(), key.getFactoryParameters()); +- logger.debug("Serialized Classloader Resource Key: [" + result + "]"); ++ logger.config("Serialized Classloader Resource Key: [" + result + "]"); + return result; + } + +diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/zip/ZipResourceLoader.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/zip/ZipResourceLoader.java +--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/zip/ZipResourceLoader.java 2021-04-07 10:55:58.344147426 +0100 ++++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/zip/ZipResourceLoader.java 2021-04-07 11:02:18.522814132 +0100 +@@ -21,8 +21,7 @@ + import java.util.HashMap; + import java.util.Map; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.resourceloader.ResourceData; + import org.pentaho.reporting.libraries.resourceloader.ResourceException; + import org.pentaho.reporting.libraries.resourceloader.ResourceKey; +@@ -40,7 +39,7 @@ + public class ZipResourceLoader implements ResourceLoader + { + public static final String SCHEMA_NAME = ZipResourceLoader.class.getName(); +- private static final Log logger = LogFactory.getLog(ZipResourceLoader.class); ++ private static final Logger logger = Logger.getLogger(ZipResourceLoader.class.getName()); + + public ZipResourceLoader() + { +diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHCacheModule.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHCacheModule.java +--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHCacheModule.java 2021-04-07 10:55:58.345147438 +0100 ++++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHCacheModule.java 2021-04-07 10:58:52.758288370 +0100 +@@ -20,8 +20,7 @@ + import org.pentaho.reporting.libraries.base.boot.AbstractModule; + import org.pentaho.reporting.libraries.base.boot.ModuleInitializeException; + import org.pentaho.reporting.libraries.base.boot.SubSystem; +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + + /** + * Creation-Date: 13.04.2006, 16:29:07 +@@ -30,7 +29,7 @@ + */ + public class EHCacheModule extends AbstractModule + { +- public static final Log CACHE_MONITOR = LogFactory.getLog(EHCacheModule.class.getName() + "#CacheLog"); ++ public static final Logger CACHE_MONITOR = Logger.getLogger(EHCacheModule.class.getName() + "#CacheLog"); + + public EHCacheModule() throws ModuleInitializeException + { +diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceFactoryCache.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceFactoryCache.java +--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceFactoryCache.java 2021-04-07 10:55:58.345147438 +0100 ++++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceFactoryCache.java 2021-04-07 10:59:17.251589016 +0100 +@@ -20,8 +20,7 @@ + import net.sf.ehcache.Cache; + import net.sf.ehcache.CacheException; + import net.sf.ehcache.Element; +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.resourceloader.Resource; + import org.pentaho.reporting.libraries.resourceloader.ResourceKey; + import org.pentaho.reporting.libraries.resourceloader.cache.ResourceFactoryCache; +@@ -110,7 +109,7 @@ + } + } + +- private static final Log logger = LogFactory.getLog(EHResourceFactoryCache.class); ++ private static final Logger logger = Logger.getLogger(EHResourceFactoryCache.class.getName()); + private Cache factoryCache; + + public EHResourceFactoryCache(final Cache factoryCache) +diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/ResourceKeyUtils.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/ResourceKeyUtils.java +--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/ResourceKeyUtils.java 2021-04-07 10:55:58.342147402 +0100 ++++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/ResourceKeyUtils.java 2021-04-07 11:06:27.248867251 +0100 +@@ -27,8 +27,8 @@ + import java.util.Iterator; + import java.util.Map; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Level; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.base.util.CSVQuoter; + import org.pentaho.reporting.libraries.base.util.CSVTokenizer; + import org.pentaho.reporting.libraries.base.util.IOUtils; +@@ -42,7 +42,7 @@ + { + private static final String DELIMITER = ";"; + private static final String SERIALIZATION_PREFIX = "resourcekey:"; +- private static final Log logger = LogFactory.getLog(ResourceManager.class); ++ private static final Logger logger = Logger.getLogger(ResourceManager.class.getName()); + + /** + * Returns a string representation of the ResourceKey based on the pieces that are passed as parameters +@@ -169,7 +169,7 @@ + + sb.append(quoter.doQuoting(entrySb.toString())); + } +- logger.debug("Converted ResourceKey's Factory Parameters to String: [" + sb.toString() + "]"); ++ logger.config("Converted ResourceKey's Factory Parameters to String: [" + sb.toString() + "]"); + return sb.toString(); + } + +@@ -226,9 +226,9 @@ + params.put(key, value); + } + +- if (logger.isDebugEnabled()) ++ if (logger.isLoggable(Level.CONFIG)) + { +- logger.debug("Converted ResourceKey's Factory Parameter String to a Map: [" + factoryParameters ++ logger.config("Converted ResourceKey's Factory Parameter String to a Map: [" + factoryParameters + + "] -> map of size " + params.size()); + } + return params; +@@ -369,7 +369,7 @@ + } + catch (IOException e) + { +- logger.error("Error closing input stream", e); ++ logger.severe("Error closing input stream: " + e); + } + } + } +diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/ResourceManager.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/ResourceManager.java +--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/ResourceManager.java 2021-04-07 10:55:58.344147426 +0100 ++++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/ResourceManager.java 2021-04-07 11:07:50.557889876 +0100 +@@ -22,8 +22,8 @@ + import java.util.Map; + import java.util.Set; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Level; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.base.config.Configuration; + import org.pentaho.reporting.libraries.base.util.ObjectUtilities; + import org.pentaho.reporting.libraries.resourceloader.cache.BundleCacheResourceWrapper; +@@ -57,7 +57,7 @@ + */ + public final class ResourceManager + { +- private static final Log logger = LogFactory.getLog(ResourceManager.class); ++ private static final Logger logger = Logger.getLogger(ResourceManager.class.getName()); + private ResourceManagerBackend backend; + + public static final String BUNDLE_LOADER_PREFIX = "org.pentaho.reporting.libraries.resourceloader.bundle.loader."; +@@ -273,7 +273,7 @@ + final ResourceBundleData bundle = loadResourceBundle(key); + if (bundle != null) + { +- logger.debug("Loaded bundle for key " + key); ++ logger.config("Loaded bundle for key " + key); + return bundle; + } + final ResourceKey parent = key.getParent(); +@@ -283,7 +283,7 @@ + final ResourceBundleData parentData = loadResourceBundle(parent); + if (parentData != null) + { +- logger.debug("Loaded bundle for key (derivate) " + key); ++ logger.config("Loaded bundle for key (derivate) " + key); + return parentData.deriveData(key); + } + } +@@ -400,9 +400,9 @@ + newResource = backend.create(derivedManager, resourceBundleData, context, target); + if (isResourceCacheable(newResource)) + { +- if (EHCacheModule.CACHE_MONITOR.isDebugEnabled()) ++ if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG)) + { +- EHCacheModule.CACHE_MONITOR.debug("Storing created bundle-resource for key: " + key); ++ EHCacheModule.CACHE_MONITOR.config("Storing created bundle-resource for key: " + key); + } + factoryCache.put(newResource); + if (key != newResource.getSource()) +@@ -412,9 +412,9 @@ + } + else + { +- if (EHCacheModule.CACHE_MONITOR.isDebugEnabled()) ++ if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG)) + { +- EHCacheModule.CACHE_MONITOR.debug("Created bundle-resource is not cacheable for " + key); ++ EHCacheModule.CACHE_MONITOR.config("Created bundle-resource is not cacheable for " + key); + } + } + } +@@ -423,17 +423,17 @@ + newResource = backend.create(this, loadedData, context, target); + if (isResourceCacheable(newResource)) + { +- if (EHCacheModule.CACHE_MONITOR.isDebugEnabled()) ++ if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG)) + { +- EHCacheModule.CACHE_MONITOR.debug("Storing created resource for key: " + key); ++ EHCacheModule.CACHE_MONITOR.config("Storing created resource for key: " + key); + } + factoryCache.put(newResource); + } + else + { +- if (EHCacheModule.CACHE_MONITOR.isDebugEnabled()) ++ if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG)) + { +- EHCacheModule.CACHE_MONITOR.debug("Created resource is not cacheable for " + key); ++ EHCacheModule.CACHE_MONITOR.config("Created resource is not cacheable for " + key); + } + } + } +@@ -556,7 +556,7 @@ + { + if (failedModules.contains(dataCacheProviderClass) == false) + { +- logger.warn("Failed to create data cache: " + e.getLocalizedMessage()); ++ logger.warning("Failed to create data cache: " + e.getLocalizedMessage()); + failedModules.add(dataCacheProviderClass); + } + } +@@ -593,7 +593,7 @@ + { + if (failedModules.contains(dataCacheProviderClass) == false) + { +- logger.warn("Failed to create data cache: " + e.getLocalizedMessage()); ++ logger.warning("Failed to create data cache: " + e.getLocalizedMessage()); + failedModules.add(dataCacheProviderClass); + } + } +@@ -630,7 +630,7 @@ + { + if (failedModules.contains(cacheProviderClass) == false) + { +- logger.warn("Failed to create factory cache: " + e.getLocalizedMessage()); ++ logger.warning("Failed to create factory cache: " + e.getLocalizedMessage()); + failedModules.add(cacheProviderClass); + } + } diff --git a/java-jfree-libloader.spec b/java-jfree-libloader.spec index 3c9bea9..c803bfd 100644 --- a/java-jfree-libloader.spec +++ b/java-jfree-libloader.spec @@ -1,120 +1,52 @@ -%define with_gcj 1 -%define javahome %{_jvmdir}/jdk Name: java-jfree-libloader Version: 1.1.3 -Release: 1mamba +Release: 2mamba Summary: LibLoader is a resource loading framework Group: Development/Libraries/Java Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://reporting.pentaho.org/ -# http://sourceforge.net/projects/jfreereport/ -# cvs -d:pserver:anonymous@jfreereport.cvs.sourceforge.net:/cvsroot/jfreereport login -# cvs -z3 -d:pserver:anonymous@jfreereport.cvs.sourceforge.net:/cvsroot/jfreereport co -P libloader -#Source: http://downloads.sourceforge.net/project/jfreereport/30.%20OpenOffice%20Branches/OOo31/libloader-%{version}-OOo31.zip -Source: http://downloads.sourceforge.net/project/jfreereport/02.%20Libraries/1.1.3-stable/libloader-1.1.3.zip -Patch0: java-jfree-libloader-1.1.3-build_properties.patch -# disable echache support (require hibernate3, ..., jboss, ..., spring, ...) -Patch1: java-jfree-libloader-1.1.3-common_build_xml.patch -# add batik & libpixie support only -Patch2: java-jfree-libloader-1.1.3-01-common_build_xml.patch +URL: https://community.hitachivantara.com/home +Source: http://downloads.sourceforge.net/project/jfreereport/02.%20Libraries/%{version}-stable/libloader-%{version}.zip +Patch0: java-jfree-libloader-1.1.3-build.patch +Patch1: java-jfree-libloader-1.1.3-java11.patch +Patch2: java-jfree-libloader-1.1.3-remove-antcontrib-support.patch +Patch3: java-jfree-libloader-1.1.3-remove-commons-logging.patch License: LGPL -BuildRequires: ant-contribb3 +## AUTOBUILDREQ-BEGIN +## AUTOBUILDREQ-END +BuildRequires: javapackages BuildRequires: apache-ant -BuildRequires: jakarta-commons-logging BuildRequires: java-jfree-libbase -BuildRequires: apache-batik -#BuildRequires: java-backport-util-concurrent -#BuildRequires: java-ehcache -#BuildRequires: java-jsr107cache -BuildRequires: java-jfree-libpixie -BuildRequires: java-junit3 -BuildRequires: jpackage-utils -BuildRequires: xml-commons-apis Requires: java-jfree-libbase -Requires: jpackage-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: javapackages %description LibLoader is a general purpose resource loading framework. It has been designed to allow to load resources from any physical location and to allow the processing of that content data in a generic way, totally transparent to the user of that library. -%if %with_gcj -%package gcj -Group: System/Libraries/Java -Summary: GCJ support for %{name} -## AUTOBUILDREQ-BEGIN -BuildRequires: glibc-devel -BuildRequires: java-gcj-compat -BuildRequires: libgcc -BuildRequires: libgcj4-devel -BuildRequires: libz-devel -## AUTOBUILDREQ-END -Requires: java-gcj-compat - -%description gcj -LibLoader is a resource loading framework. - -This package contains GCJ support for %{name}. -%endif - %package javadoc Group: Documentation Summary: Javadoc for %{name} %description javadoc LibLoader is a resource loading framework. - This package contains documentation for %{name}. %prep +%setup -q -c +%patch0 -p1 -b .build +%patch1 -p1 -b .java11 +%patch2 -p1 -b .remove-antcontrib-support +%patch3 -p1 -b .remove-commons-logging -%setup -q -c -n libloader -%patch0 -#%patch1 -%patch2 - -for j in $(find . -name "*.jar"); do - rm -rf $j -done - -mkdir -p lib test-lib - -ln -sf $(build-classpath commons-logging) lib/commons-logging.jar -ln -sf $(build-classpath commons-logging-api) lib/commons-logging-api-1.0.4.jar -ln -sf $(build-classpath libbase) lib/libbase-%{version}.jar -ln -sf $(build-classpath libpixie) lib/libpixie-%{version}.jar - -#ln -sf $(build-classpath junit-3.8.2) test-lib/junit-3.8.1.jar -#ln -sf $(build-classpath backport-util-concurrent) lib/backport-util-concurrent-3.0.jar -#ln -sf $(build-classpath jsr107cache) lib/jsr107cache-1.0.jar -#ln -sf $(build-classpath ehcache-1.4.1) lib/ehcache-1.4.1.jar -ln -sf $(build-classpath batik-awt-util) lib/batik-awt-util-1.6.jar -ln -sf $(build-classpath batik-bridge) lib/batik-bridge-1.6.jar -ln -sf $(build-classpath batik-css) lib/batik-css-1.6.jar -ln -sf $(build-classpath batik-dom) lib/batik-dom-1.6.jar -ln -sf $(build-classpath batik-ext) lib/batik-ext-1.6.jar -ln -sf $(build-classpath batik-gui-util) lib/batik-gui-util-1.6.jar -ln -sf $(build-classpath batik-gvt) lib/batik-gvt-1.6.jar -ln -sf $(build-classpath batik-parser) lib/batik-parser-1.6.jar -ln -sf $(build-classpath batik-script) lib/batik-script-1.6.jar -ln -sf $(build-classpath batik-svg-dom) lib/batik-svg-dom-1.6.jar -ln -sf $(build-classpath batik-util) lib/batik-util-1.6.jar -ln -sf $(build-classpath batik-xml) lib/batik-xml-1.6.jar -ln -sf $(build-classpath xml-commons-apis-ext) lib/xml-apis-1.0.b2.jar - -ln -s %{_javadir}/ant lib/ant-contrib - -for txt in ChangeLog.txt licence-LGPL.txt README.txt; do - %{__perl} -pi -e 's/\r$//g' $txt -done +find . -name "*.jar" -exec rm -f {} \; +mkdir -p lib +build-jar-repository -s -p lib libbase +cd lib +ln -s /usr/share/java/ant ant-contrib %build -unset JAVA_HOME -export JAVA_HOME=%{javahome} -export CLASSPATH=$(build-classpath ant-contribb3 batik-all libpixie junit-3.8.2 commons-logging xml-commons-apis-ext) -ant \ - jar javadoc +ant jar javadoc %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -133,10 +65,6 @@ install -pm 644 dist/libloader-%{version}.jar %{buildroot}%{_javadir}/libloader- mkdir -p %{buildroot}%{_javadocdir}/libloader cp -pr bin/javadoc/docs/api/* %{buildroot}%{_javadocdir}/libloader -%if %with_gcj -%{_bindir}/aot-compile-rpm -%endif - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -144,30 +72,16 @@ cp -pr bin/javadoc/docs/api/* %{buildroot}%{_javadocdir}/libloader %defattr(-,root,root) %{_javadir}/libloader-%{version}.jar %{_javadir}/libloader.jar -%doc ChangeLog.txt licence-LGPL.txt README.txt - -%if %with_gcj -%post gcj -if [ -x %{_bindir}/rebuild-gcj-db ] ; then - %{_bindir}/rebuild-gcj-db -fi - -%postun gcj -if [ -x %{_bindir}/rebuild-gcj-db ] ; then - %{_bindir}/rebuild-gcj-db -fi - -%files gcj -%defattr(-,root,root) -%{_libdir}/gcj/java-jfree-libloader/libloader-%{version}.jar.db -%{_libdir}/gcj/java-jfree-libloader/libloader-%{version}.jar.so -%endif +%doc licence-LGPL.txt %files javadoc %defattr(-,root,root) %{_javadocdir}/libloader %changelog +* Fri Dec 10 2021 Silvan Calarco 1.1.3-2mamba +- rebuilt without gcj and with java 11 + * Sat Jan 22 2011 gil 1.1.3-1mamba - update to 1.1.3