Toshaan Bharvani
5 months ago
commit
28b362ff58
5 changed files with 1260 additions and 0 deletions
@ -0,0 +1,16 @@
@@ -0,0 +1,16 @@
|
||||
--- libbase-1.1.3/build.properties 2009-11-17 13:12:25.000000000 +0000 |
||||
+++ libbase-1.1.3/build.properties 2009-11-17 13:12:37.000000000 +0000 |
||||
@@ -1,4 +1,4 @@ |
||||
-project.revision=TRUNK-SNAPSHOT |
||||
+project.revision=1.1.3 |
||||
ivy.artifact.group=pentaho-library |
||||
ivy.artifact.id=libbase |
||||
impl.title=Libbase |
||||
@@ -7,3 +7,7 @@ |
||||
testsrc.dir=${basedir}/testcases |
||||
|
||||
java.awt.headless=true |
||||
+ |
||||
+antcontrib.available=true |
||||
+ |
||||
+build.cache.dir=lib |
@ -0,0 +1,13 @@
@@ -0,0 +1,13 @@
|
||||
--- libbase-1.1.3/common_build.xml 2020-05-05 19:34:48.033291800 +0100 |
||||
+++ libbase-1.1.3/common_build.xml 2020-05-05 19:34:57.346369361 +0100 |
||||
@@ -136,8 +136,8 @@ |
||||
<property name="javac.deprecation" |
||||
value="true" |
||||
description="Indicates whether source should be compiled with deprecation information" /> |
||||
- <property name="javac.source" value="1.5" description="Provide source compatibility with specified release" /> |
||||
- <property name="javac.target" value="1.5" description="Generate class files for specific VM version" /> |
||||
+ <property name="javac.source" value="1.6" description="Provide source compatibility with specified release" /> |
||||
+ <property name="javac.target" value="1.6" description="Generate class files for specific VM version" /> |
||||
|
||||
<!-- Build Cache properties --> |
||||
<property name="build.cache.dir" |
@ -0,0 +1,276 @@
@@ -0,0 +1,276 @@
|
||||
diff --git a/build.properties b/build.properties |
||||
index 9340c5b..557d5b0 100644 |
||||
--- a/build.properties |
||||
+++ b/build.properties |
||||
@@ -8,6 +8,6 @@ testsrc.dir=${basedir}/testcases |
||||
|
||||
java.awt.headless=true |
||||
|
||||
-antcontrib.available=true |
||||
+antcontrib.available=false |
||||
|
||||
build.cache.dir=lib |
||||
diff --git a/common_build.xml b/common_build.xml |
||||
index 3a42daa..104e1c8 100644 |
||||
--- a/common_build.xml |
||||
+++ b/common_build.xml |
||||
@@ -152,9 +152,6 @@ TYPICAL TARGET SEQUENCE |
||||
<property name="cobertura.build.cache.dir" |
||||
value="${build.cache.dir}/cobertura" |
||||
description="Directory where the Cobertura jar (and dependencies) is placed after it is auto-downloaded by the build" /> |
||||
- <property name="antcontrib.build.cache.dir" |
||||
- value="${build.cache.dir}/ant-contrib" |
||||
- description="Directory where the Ant-Contrib jar (and dependencies) is placed after it is auto-downloaded by the build" /> |
||||
<property name="pentaho.build.cache.dir" |
||||
value="${build.cache.dir}/pentaho" |
||||
description="Directory where the Pentaho ant tasks jar (and dependencies) is placed after it is auto-downloaded by the build" /> |
||||
@@ -325,68 +322,6 @@ TYPICAL TARGET SEQUENCE |
||||
</path> |
||||
|
||||
|
||||
- <!--======================================================================= |
||||
- install-antcontrib |
||||
- |
||||
- (Fetches and) installs ant-contrib tasks. |
||||
- ====================================================================--> |
||||
- <target name="install-antcontrib" |
||||
- depends="antcontrib.download-check"> |
||||
- <taskdef resource="net/sf/antcontrib/antlib.xml"> |
||||
- <classpath> |
||||
- <fileset dir="${antcontrib.build.cache.dir}"> |
||||
- <include name="*.jar" /> |
||||
- </fileset> |
||||
- </classpath> |
||||
- </taskdef> |
||||
- </target> |
||||
- |
||||
- |
||||
- <!--======================================================================= |
||||
- antcontrib.download-check |
||||
- |
||||
- Fetches ant-contrib from sourceforge if it is not already present |
||||
- ====================================================================--> |
||||
- <target name="antcontrib.download-check"> |
||||
- <condition property="antcontrib.available"> |
||||
- <and> |
||||
- <available file="${antcontrib.build.cache.dir}" /> |
||||
- <available classname="net.sf.antcontrib.logic.IfTask"> |
||||
- <classpath> |
||||
- <fileset dir="${antcontrib.build.cache.dir}"> |
||||
- <include name="*.jar" /> |
||||
- </fileset> |
||||
- </classpath> |
||||
- </available> |
||||
- </and> |
||||
- </condition> |
||||
- <antcall target="antcontrib.download" /> |
||||
- </target> |
||||
- |
||||
- |
||||
- <!--======================================================================= |
||||
- antcontrib.download |
||||
- |
||||
- Fetches ant-contrib from sourceforge |
||||
- ====================================================================--> |
||||
- <target name="antcontrib.download" unless="antcontrib.available"> |
||||
- <mkdir dir="${tmp.build.cache.dir}" /> |
||||
- <get src="http://downloads.sourceforge.net/ant-contrib/ant-contrib-1.0b3-bin.zip" |
||||
- dest="${tmp.build.cache.dir}/antcontrib.zip" |
||||
- usetimestamp="true" /> |
||||
- <unzip src="${tmp.build.cache.dir}/antcontrib.zip" dest="${tmp.build.cache.dir}"> |
||||
- <patternset> |
||||
- <include name="**/*.jar" /> |
||||
- </patternset> |
||||
- </unzip> |
||||
- <copy todir="${antcontrib.build.cache.dir}"> |
||||
- <fileset dir="${tmp.build.cache.dir}/ant-contrib"> |
||||
- <include name="**/*.jar" /> |
||||
- </fileset> |
||||
- </copy> |
||||
- </target> |
||||
- |
||||
- |
||||
<!--======================================================================= |
||||
init |
||||
|
||||
@@ -445,7 +380,7 @@ TYPICAL TARGET SEQUENCE |
||||
(Fetches and) installs the SVN ANT for use by this ant script |
||||
====================================================================--> |
||||
<target name="install-svnant" |
||||
- depends="install-antcontrib, svnant.download-check"> |
||||
+ depends="svnant.download-check"> |
||||
<if> |
||||
<istrue value="${svnant.isinstalled}" /> |
||||
<then> |
||||
@@ -491,58 +426,13 @@ TYPICAL TARGET SEQUENCE |
||||
</target> |
||||
|
||||
|
||||
- <!--======================================================================= |
||||
- set-build.id |
||||
- |
||||
- Sets a property build.id to the either "development" or the svn revision |
||||
- if in release mode |
||||
- ====================================================================--> |
||||
- <target name="set-build.id" unless="build.id" depends="install-antcontrib"> |
||||
- <if> |
||||
- <istrue value="${release}" /> |
||||
- <then> |
||||
- <antcallback target="svn-revision" return="svn.revision" /> |
||||
- <property name="build.id" value="${svn.revision}" /> |
||||
- </then> |
||||
- <else> |
||||
- <property name="build.id" value="development" /> |
||||
- </else> |
||||
- </if> |
||||
- </target> |
||||
- |
||||
- <!--================================================================================= |
||||
- version-properties: common Ant driven version file generation. Projects that produce |
||||
- a package or packages should run this target. Projects that produce |
||||
- jars only should NOT. |
||||
- ===================================================================================--> |
||||
- <target name="version-properties" depends="set-build.id"> |
||||
- <tstamp> |
||||
- <format property="build.time" pattern="yyyy/MM/dd hh:mm aa"/> |
||||
- </tstamp> |
||||
- <propertyfile |
||||
- file="version.properties" comment="Release Build version info"> |
||||
- <entry key="release.major.number" value="${release.major.number}" /> |
||||
- <entry key="release.minor.number" value="${release.minor.number}" /> |
||||
- <entry key="release.milestone.number" value="${release.milestone.number}" /> |
||||
- <entry key="release.candidate.token" value="${release.candidate.token}" /> |
||||
- <entry key="impl.vendor" value="${impl.vendor}" /> |
||||
- <entry key="impl.version" value="${release.major.number}.${release.minor.number}.${release.milestone.number}.${build.id}" /> |
||||
- <entry key="impl.title" value="${impl.title}" /> |
||||
- <entry key="buildDate" value="${build.time}"/> |
||||
- <entry key="svn.revision" value="${build.id}"/> |
||||
- <entry key="release.build.number" default="0" type="int" operation="+" value="1" pattern="0000"/> |
||||
- </propertyfile> |
||||
- <property file="${basedir}/version.properties"/> |
||||
- </target> |
||||
- |
||||
- |
||||
<!--======================================================================= |
||||
install-ivy |
||||
|
||||
(Fetches and) installs the IVY jar for use by this ant script |
||||
====================================================================--> |
||||
<target name="install-ivy" |
||||
- depends="install-antcontrib,ivy.download-check"> |
||||
+ depends="ivy.download-check"> |
||||
<if> |
||||
<istrue value="${ivy.isinstalled}" /> |
||||
<then> |
||||
@@ -602,7 +492,7 @@ TYPICAL TARGET SEQUENCE |
||||
Verifies that there are no SNAPSHOT dependencies defined in the ivy xml. |
||||
If there are SNAPSHOTS, fail the release build. |
||||
====================================================================--> |
||||
- <target name="ivy.check-releasable" depends="install-ivy, install-antcontrib"> |
||||
+ <target name="ivy.check-releasable" depends="install-ivy"> |
||||
<if> |
||||
<istrue value="${release}" /> |
||||
<then> |
||||
@@ -769,7 +659,7 @@ TYPICAL TARGET SEQUENCE |
||||
Publishes the jar file for this project to a Maven2 repository. |
||||
====================================================================--> |
||||
<target name="publish-pentaho-nojar" |
||||
- depends="install-antcontrib,create-pom,ivy.deliver"> |
||||
+ depends="create-pom,ivy.deliver"> |
||||
<antcall target="maven-publish-dependencies"> |
||||
<param name="publish.groupId" value="${ivy.artifact.group}" /> |
||||
<param name="publish.artifactId" value="${ivy.artifact.id}" /> |
||||
@@ -1038,12 +928,11 @@ TYPICAL TARGET SEQUENCE |
||||
- compile.pre : anything needed to prep for compile |
||||
- compile.compile : the actual compilation step |
||||
- compile.src_copy : copying the source into the bin directory |
||||
- - compile.res_copy : copying the resources into the bin directory |
||||
- compile.lic_copy : copying the license information into the bin directory |
||||
- compile.post : anything needed after the compile is done |
||||
====================================================================--> |
||||
<target name="compile" |
||||
- depends="init, compile.pre, compile.compile, compile.src_copy, compile.res_copy, compile.lic_copy, compile.post" |
||||
+ depends="init, compile.pre, compile.compile, compile.src_copy, compile.lic_copy, compile.post" |
||||
description="Performs all the steps to prepare the bin directory with a complete compilation" /> |
||||
|
||||
|
||||
@@ -1075,36 +964,6 @@ TYPICAL TARGET SEQUENCE |
||||
</target> |
||||
|
||||
|
||||
- <!--======================================================================= |
||||
- compile.res_copy |
||||
- |
||||
- Copies any needed resources into the classes directory. Will not |
||||
- duplicate copying of resources from src tree (handled by compile.src_copy |
||||
- if jar.include.source is set. |
||||
- ====================================================================--> |
||||
- <target name="compile.res_copy" depends="install-antcontrib"> |
||||
- <if> |
||||
- <available file="${res.dir}" /> |
||||
- <then> |
||||
- <copy todir="${classes.dir}"> |
||||
- <fileset dir="${res.dir}" /> |
||||
- </copy> |
||||
- </then> |
||||
- </if> |
||||
- |
||||
- <if> |
||||
- <not> |
||||
- <isset property="jar.include.source" /> |
||||
- </not> |
||||
- <then> |
||||
- <copy todir="${classes.dir}" flatten="false"> |
||||
- <fileset dir="${src.dir}" excludes="**/*.java" /> |
||||
- </copy> |
||||
- </then> |
||||
- </if> |
||||
- </target> |
||||
- |
||||
- |
||||
<!--======================================================================= |
||||
compile.src_copy |
||||
|
||||
@@ -1151,20 +1010,19 @@ TYPICAL TARGET SEQUENCE |
||||
|
||||
Creates a jar file from the bin directory |
||||
====================================================================--> |
||||
- <target name="jar" depends="compile,set-build.id,generate.manifest" description="Jars up the bin directory after a compile"> |
||||
+ <target name="jar" depends="compile,generate.manifest" description="Jars up the bin directory after a compile"> |
||||
<jar destfile="${dist.dir}/${ivy.artifact.id}-${project.revision}.jar" manifest="${dist.manifest.file}"> |
||||
<fileset dir="${classes.dir}" /> |
||||
</jar> |
||||
</target> |
||||
|
||||
- |
||||
<!--======================================================================= |
||||
- generate.manifest |
||||
- |
||||
- Creates a new manifest file if one is not specified, or updates |
||||
- an existing manifest file if one is specified. |
||||
- ====================================================================--> |
||||
- <target name="generate.manifest" depends="init,set-build.id"> |
||||
+ generate.manifest |
||||
+ |
||||
+ Creates a new manifest file if one is not specified, or updates |
||||
+ an existing manifest file if one is specified. |
||||
+ ====================================================================--> |
||||
+ <target name="generate.manifest" depends="init"> |
||||
<delete file="${dist.manifest.file}" /> |
||||
<touch file="${dist.manifest.file}" /> |
||||
<copy file="${manifest.file}" tofile="${dist.manifest.file}" overwrite="true" failonerror="false" /> |
||||
@@ -1178,6 +1036,7 @@ TYPICAL TARGET SEQUENCE |
||||
</target> |
||||
|
||||
|
||||
+ |
||||
<!--======================================================================= |
||||
dist-source |
||||
|
||||
@@ -1648,4 +1507,4 @@ TYPICAL TARGET SEQUENCE |
||||
</dot-classpath> |
||||
</target> |
||||
|
||||
-</project> |
||||
\ No newline at end of file |
||||
+</project> |
@ -0,0 +1,792 @@
@@ -0,0 +1,792 @@
|
||||
diff -ru libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/boot/AbstractBoot.java libbase-1.1.3/source/org/pentaho/reporting/libraries/base/boot/AbstractBoot.java |
||||
--- libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/boot/AbstractBoot.java 2009-11-16 10:14:12.000000000 +0000 |
||||
+++ libbase-1.1.3/source/org/pentaho/reporting/libraries/base/boot/AbstractBoot.java 2021-02-23 12:11:46.680967049 +0000 |
||||
@@ -24,8 +24,7 @@ |
||||
import java.util.ArrayList; |
||||
import java.util.Enumeration; |
||||
|
||||
-import org.apache.commons.logging.Log; |
||||
-import org.apache.commons.logging.LogFactory; |
||||
+import java.util.logging.Logger; |
||||
import org.pentaho.reporting.libraries.base.config.Configuration; |
||||
import org.pentaho.reporting.libraries.base.config.ExtendedConfiguration; |
||||
import org.pentaho.reporting.libraries.base.config.ExtendedConfigurationWrapper; |
||||
@@ -52,7 +51,7 @@ |
||||
/** |
||||
* The logger for this class. |
||||
*/ |
||||
- private static final Log LOGGER = LogFactory.getLog(AbstractBoot.class); |
||||
+ private static final Logger LOGGER = Logger.getLogger(AbstractBoot.class.getName()); |
||||
|
||||
/** |
||||
* The configuration wrapper around the plain configuration. |
||||
@@ -163,7 +162,7 @@ |
||||
} |
||||
if (isBootFailed()) |
||||
{ |
||||
- LOGGER.error(getClass() + " failed to boot: " + bootFailed.getMessage()); |
||||
+ LOGGER.severe(getClass() + " failed to boot: " + bootFailed.getMessage()); |
||||
} |
||||
while (isBootInProgress()) |
||||
{ |
||||
@@ -206,7 +205,7 @@ |
||||
} |
||||
catch (Exception e) |
||||
{ |
||||
- LOGGER.error(getClass() + " failed to boot: ", e); |
||||
+ LOGGER.severe(getClass() + " failed to boot: " + e); |
||||
this.bootFailed = e; |
||||
} |
||||
finally |
||||
@@ -265,8 +264,8 @@ |
||||
if (boot.isBootFailed()) |
||||
{ |
||||
this.bootFailed = boot.getBootFailureReason(); |
||||
- LOGGER.error("Dependent project failed to boot up: " + |
||||
- projectInformation.getBootClass() + " failed to boot: ", this.bootFailed); |
||||
+ LOGGER.severe("Dependent project failed to boot up: " + |
||||
+ projectInformation.getBootClass() + " failed to boot: " + this.bootFailed); |
||||
return; |
||||
} |
||||
} |
||||
@@ -419,7 +418,7 @@ |
||||
} |
||||
catch (IOException ioe) |
||||
{ |
||||
- LOGGER.warn("Failed to load the user configuration at " + url, ioe); |
||||
+ LOGGER.warning("Failed to load the user configuration at " + url + " : " + ioe); |
||||
} |
||||
} |
||||
|
||||
@@ -431,7 +430,7 @@ |
||||
} |
||||
catch (IOException e) |
||||
{ |
||||
- LOGGER.warn("Failed to lookup the user configurations.", e); |
||||
+ LOGGER.warning("Failed to lookup the user configurations: " + e); |
||||
} |
||||
} |
||||
if (addSysProps) |
||||
@@ -455,4 +454,4 @@ |
||||
} |
||||
return extWrapper; |
||||
} |
||||
-} |
||||
\ No newline at end of file |
||||
+} |
||||
diff -ru libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/boot/PackageManager.java libbase-1.1.3/source/org/pentaho/reporting/libraries/base/boot/PackageManager.java |
||||
--- libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/boot/PackageManager.java 2009-11-16 10:14:12.000000000 +0000 |
||||
+++ libbase-1.1.3/source/org/pentaho/reporting/libraries/base/boot/PackageManager.java 2021-02-23 12:18:45.836952221 +0000 |
||||
@@ -23,8 +23,8 @@ |
||||
import java.util.HashMap; |
||||
import java.util.Iterator; |
||||
|
||||
-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.config.PropertyFileConfiguration; |
||||
import org.pentaho.reporting.libraries.base.util.ObjectUtilities; |
||||
@@ -63,7 +63,7 @@ |
||||
} |
||||
} |
||||
|
||||
- private static final Log LOGGER = LogFactory.getLog(PackageManager.class); |
||||
+ private static final Logger LOGGER = Logger.getLogger(PackageManager.class.getName()); |
||||
|
||||
/** |
||||
* An internal constant declaring that the specified module was already loaded. |
||||
@@ -201,7 +201,7 @@ |
||||
} |
||||
} |
||||
} |
||||
- LOGGER.debug("Loaded a total of " + count + " modules under prefix: " + modulePrefix); |
||||
+ LOGGER.config("Loaded a total of " + count + " modules under prefix: " + modulePrefix); |
||||
} |
||||
|
||||
/** |
||||
@@ -224,9 +224,9 @@ |
||||
|
||||
if (mod.configure(this.booter)) |
||||
{ |
||||
- if (LOGGER.isDebugEnabled()) |
||||
+ if (LOGGER.isLoggable(Level.CONFIG)) |
||||
{ |
||||
- LOGGER.debug("Conf: " + |
||||
+ LOGGER.config("Conf: " + |
||||
new PadMessage(mod.getModule().getModuleClass(), 70) + |
||||
" [" + mod.getModule().getSubSystem() + ']'); |
||||
} |
||||
@@ -244,9 +244,9 @@ |
||||
|
||||
if (mod.initialize(this.booter)) |
||||
{ |
||||
- if (LOGGER.isDebugEnabled()) |
||||
+ if (LOGGER.isLoggable(Level.CONFIG)) |
||||
{ |
||||
- LOGGER.debug("Init: " + |
||||
+ LOGGER.config("Init: " + |
||||
new PadMessage(mod.getModule().getModuleClass(), 70) + |
||||
" [" + mod.getModule().getSubSystem() + ']'); |
||||
} |
||||
@@ -271,12 +271,12 @@ |
||||
final PackageState dependentState = (PackageState) modulesByClass.get(key); |
||||
if (dependentState == null) |
||||
{ |
||||
- LOGGER.warn("Required dependency '" + key + "' for module '" + state.getModule().getModuleClass() + " not found."); |
||||
+ LOGGER.warning("Required dependency '" + key + "' for module '" + state.getModule().getModuleClass() + " not found."); |
||||
return false; |
||||
} |
||||
if (dependentState.getState() != PackageState.STATE_CONFIGURED) |
||||
{ |
||||
- LOGGER.warn("Required dependency '" + key + "' for module '" + state.getModule().getModuleClass() + " not configured."); |
||||
+ LOGGER.warning("Required dependency '" + key + "' for module '" + state.getModule().getModuleClass() + " not configured."); |
||||
return false; |
||||
} |
||||
} |
||||
@@ -300,12 +300,12 @@ |
||||
final PackageState dependentState = (PackageState) modulesByClass.get(key); |
||||
if (dependentState == null) |
||||
{ |
||||
- LOGGER.warn("Required dependency '" + key + "' for module '" + state.getModule().getModuleClass() + " not found."); |
||||
+ LOGGER.warning("Required dependency '" + key + "' for module '" + state.getModule().getModuleClass() + " not found."); |
||||
return false; |
||||
} |
||||
if (dependentState.getState() != PackageState.STATE_INITIALIZED) |
||||
{ |
||||
- LOGGER.warn("Required dependency '" + key + "' for module '" + state.getModule().getModuleClass() + " not initializable."); |
||||
+ LOGGER.warning("Required dependency '" + key + "' for module '" + state.getModule().getModuleClass() + " not initializable."); |
||||
return false; |
||||
} |
||||
} |
||||
@@ -418,15 +418,15 @@ |
||||
{ |
||||
if (fatal) |
||||
{ |
||||
- LOGGER.warn("Unresolved dependency for package: " + moduleInfo.getModuleClass()); |
||||
+ LOGGER.warning("Unresolved dependency for package: " + moduleInfo.getModuleClass()); |
||||
} |
||||
- LOGGER.debug("Module class referenced, but not in classpath: " + moduleInfo.getModuleClass()); |
||||
+ LOGGER.config("Module class referenced, but not in classpath: " + moduleInfo.getModuleClass()); |
||||
} |
||||
|
||||
if (acceptVersion(moduleInfo, module) == false) |
||||
{ |
||||
// module conflict! |
||||
- LOGGER.warn("Module " + module.getName() + ": required version: " |
||||
+ LOGGER.warning("Module " + module.getName() + ": required version: " |
||||
+ moduleInfo + ", but found Version: \n" + module); |
||||
final PackageState state = new PackageState(module, PackageState.STATE_ERROR); |
||||
dropFailedModule(state); |
||||
@@ -437,7 +437,7 @@ |
||||
if (moduleContained == RETURN_MODULE_ERROR) |
||||
{ |
||||
// the module caused harm before ... |
||||
- LOGGER.debug("Indicated failure for module: " + module.getModuleClass()); |
||||
+ LOGGER.config("Indicated failure for module: " + module.getModuleClass()); |
||||
final PackageState state = new PackageState(module, PackageState.STATE_ERROR); |
||||
dropFailedModule(state); |
||||
return false; |
||||
@@ -447,7 +447,7 @@ |
||||
if (incompleteModules.contains(module)) |
||||
{ |
||||
// we assume that loading will continue ... |
||||
- LOGGER.error |
||||
+ LOGGER.severe |
||||
("Circular module reference: This module definition is invalid: " + |
||||
module.getClass()); |
||||
final PackageState state = new PackageState(module, PackageState.STATE_ERROR); |
||||
@@ -460,7 +460,7 @@ |
||||
{ |
||||
if (loadModule(required[i], incompleteModules, modules, true) == false) |
||||
{ |
||||
- LOGGER.debug("Indicated failure for module: " + module.getModuleClass()); |
||||
+ LOGGER.config("Indicated failure for module: " + module.getModuleClass()); |
||||
final PackageState state = new PackageState(module, PackageState.STATE_ERROR); |
||||
dropFailedModule(state); |
||||
return false; |
||||
@@ -472,7 +472,7 @@ |
||||
{ |
||||
if (loadModule(optional[i], incompleteModules, modules, true) == false) |
||||
{ |
||||
- LOGGER.debug("Optional module: " + optional[i].getModuleClass() + " was not loaded."); |
||||
+ LOGGER.config("Optional module: " + optional[i].getModuleClass() + " was not loaded."); |
||||
} |
||||
} |
||||
// maybe a dependent module defined the same base module ... |
||||
@@ -486,7 +486,7 @@ |
||||
} |
||||
catch (Exception e) |
||||
{ |
||||
- LOGGER.warn("Exception while loading module: " + moduleInfo, e); |
||||
+ LOGGER.warning("Exception while loading module: " + moduleInfo + " : " + e); |
||||
return false; |
||||
} |
||||
} |
||||
@@ -506,7 +506,7 @@ |
||||
} |
||||
if (module.getMajorVersion() == null) |
||||
{ |
||||
- LOGGER.warn("Module " + module.getName() + " does not define a major version."); |
||||
+ LOGGER.warning("Module " + module.getName() + " does not define a major version."); |
||||
} |
||||
else |
||||
{ |
||||
@@ -528,7 +528,7 @@ |
||||
} |
||||
if (module.getMinorVersion() == null) |
||||
{ |
||||
- LOGGER.warn("Module " + module.getName() + " does not define a minor version."); |
||||
+ LOGGER.warning("Module " + module.getName() + " does not define a minor version."); |
||||
} |
||||
else |
||||
{ |
||||
@@ -550,14 +550,14 @@ |
||||
} |
||||
if (module.getPatchLevel() == null) |
||||
{ |
||||
- LOGGER.debug("Module " + module.getName() + " does not define a patch level."); |
||||
+ LOGGER.config("Module " + module.getName() + " does not define a patch level."); |
||||
} |
||||
else |
||||
{ |
||||
if (acceptVersion(moduleRequirement.getPatchLevel(), |
||||
module.getPatchLevel()) > 0) |
||||
{ |
||||
- LOGGER.debug("Did not accept patchlevel: " |
||||
+ LOGGER.config("Did not accept patchlevel: " |
||||
+ moduleRequirement.getPatchLevel() + " - " |
||||
+ module.getPatchLevel()); |
||||
return false; |
||||
@@ -699,4 +699,4 @@ |
||||
p.println(mod.getDescription()); |
||||
} |
||||
} |
||||
-} |
||||
\ No newline at end of file |
||||
+} |
||||
diff -ru libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/boot/PackageSorter.java libbase-1.1.3/source/org/pentaho/reporting/libraries/base/boot/PackageSorter.java |
||||
--- libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/boot/PackageSorter.java 2009-11-16 10:14:12.000000000 +0000 |
||||
+++ libbase-1.1.3/source/org/pentaho/reporting/libraries/base/boot/PackageSorter.java 2021-02-23 12:19:11.752198616 +0000 |
||||
@@ -23,8 +23,7 @@ |
||||
import java.util.Iterator; |
||||
import java.util.List; |
||||
|
||||
-import org.apache.commons.logging.Log; |
||||
-import org.apache.commons.logging.LogFactory; |
||||
+import java.util.logging.Logger; |
||||
import org.pentaho.reporting.libraries.base.util.ObjectUtilities; |
||||
|
||||
/** |
||||
@@ -180,7 +179,7 @@ |
||||
} |
||||
|
||||
/** A logger for debug-messages. */ |
||||
- private static final Log LOGGER = LogFactory.getLog(PackageSorter.class); |
||||
+ private static final Logger LOGGER = Logger.getLogger(PackageSorter.class.getName()); |
||||
|
||||
/** |
||||
* DefaultConstructor. |
||||
@@ -313,7 +312,7 @@ |
||||
final SortModule reqMod = (SortModule) moduleMap.get(moduleName); |
||||
if (reqMod == null) |
||||
{ |
||||
- LOGGER.warn("Invalid state: Required dependency of '" + moduleName + "' had an error."); |
||||
+ LOGGER.warning("Invalid state: Required dependency of '" + moduleName + "' had an error."); |
||||
continue; |
||||
} |
||||
if (reqMod.getPosition() >= position) |
||||
@@ -415,7 +414,7 @@ |
||||
moduleMap.get(requiredModules[i].getModuleClass()); |
||||
if (dependentModule == null) |
||||
{ |
||||
- LOGGER.warn |
||||
+ LOGGER.warning |
||||
("A dependent module was not found in the list of known modules." + |
||||
requiredModules[i].getModuleClass()); |
||||
continue; |
||||
@@ -431,11 +430,11 @@ |
||||
moduleMap.get(optionalModules[i].getModuleClass()); |
||||
if (dependentModule == null) |
||||
{ |
||||
- LOGGER.warn("A dependent module was not found in the list of known modules."); |
||||
+ LOGGER.warning("A dependent module was not found in the list of known modules."); |
||||
continue; |
||||
} |
||||
collector.add(dependentModule.getSubSystem()); |
||||
} |
||||
return collector; |
||||
} |
||||
-} |
||||
\ No newline at end of file |
||||
+} |
||||
diff -ru libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/boot/PackageState.java libbase-1.1.3/source/org/pentaho/reporting/libraries/base/boot/PackageState.java |
||||
--- libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/boot/PackageState.java 2009-11-16 10:14:12.000000000 +0000 |
||||
+++ libbase-1.1.3/source/org/pentaho/reporting/libraries/base/boot/PackageState.java 2021-02-23 12:22:15.204942814 +0000 |
||||
@@ -17,8 +17,8 @@ |
||||
|
||||
package org.pentaho.reporting.libraries.base.boot; |
||||
|
||||
-import org.apache.commons.logging.Log; |
||||
-import org.apache.commons.logging.LogFactory; |
||||
+import java.util.logging.Level; |
||||
+import java.util.logging.Logger; |
||||
|
||||
/** |
||||
* The package state class is used by the package manager to keep track of |
||||
@@ -31,7 +31,7 @@ |
||||
public class PackageState |
||||
{ |
||||
/** A logger. */ |
||||
- private static final Log LOGGER = LogFactory.getLog(PackageState.class); |
||||
+ private static final Logger LOGGER = Logger.getLogger(PackageState.class.getName()); |
||||
|
||||
/** |
||||
* A constant defining that the package is new. |
||||
@@ -119,20 +119,20 @@ |
||||
} |
||||
catch (NoClassDefFoundError noClassDef) |
||||
{ |
||||
- LOGGER.warn("Unable to load module classes for " + |
||||
+ LOGGER.warning("Unable to load module classes for " + |
||||
this.module.getName() + ':' + noClassDef.getMessage()); |
||||
this.state = STATE_ERROR; |
||||
} |
||||
catch (Exception e) |
||||
{ |
||||
- if (LOGGER.isDebugEnabled()) |
||||
+ if (LOGGER.isLoggable(Level.CONFIG)) |
||||
{ |
||||
// its still worth a warning, but now we are more verbose ... |
||||
- LOGGER.warn("Unable to configure the module " + this.module.getName(), e); |
||||
+ LOGGER.warning("Unable to configure the module " + this.module.getName() + " : " + e); |
||||
} |
||||
- else if (LOGGER.isWarnEnabled()) |
||||
+ else if (LOGGER.isLoggable(Level.WARNING)) |
||||
{ |
||||
- LOGGER.warn("Unable to configure the module " + this.module.getName()); |
||||
+ LOGGER.warning("Unable to configure the module " + this.module.getName()); |
||||
} |
||||
this.state = STATE_ERROR; |
||||
} |
||||
@@ -187,32 +187,32 @@ |
||||
} |
||||
catch (NoClassDefFoundError noClassDef) |
||||
{ |
||||
- LOGGER.warn("Unable to load module classes for " + this.module.getName() + ':' + noClassDef.getMessage()); |
||||
+ LOGGER.warning("Unable to load module classes for " + this.module.getName() + ':' + noClassDef.getMessage()); |
||||
this.state = STATE_ERROR; |
||||
} |
||||
catch (ModuleInitializeException me) |
||||
{ |
||||
- if (LOGGER.isDebugEnabled()) |
||||
+ if (LOGGER.isLoggable(Level.CONFIG)) |
||||
{ |
||||
// its still worth a warning, but now we are more verbose ... |
||||
- LOGGER.warn("Unable to initialize the module " + this.module.getName(), me); |
||||
+ LOGGER.warning("Unable to initialize the module " + this.module.getName() + " : " + me); |
||||
} |
||||
- else if (LOGGER.isWarnEnabled()) |
||||
+ else if (LOGGER.isLoggable(Level.WARNING)) |
||||
{ |
||||
- LOGGER.warn("Unable to initialize the module " + this.module.getName()); |
||||
+ LOGGER.warning("Unable to initialize the module " + this.module.getName()); |
||||
} |
||||
this.state = STATE_ERROR; |
||||
} |
||||
catch (Exception e) |
||||
{ |
||||
- if (LOGGER.isDebugEnabled()) |
||||
+ if (LOGGER.isLoggable(Level.CONFIG)) |
||||
{ |
||||
// its still worth a warning, but now we are more verbose ... |
||||
- LOGGER.warn("Unable to initialize the module " + this.module.getName(), e); |
||||
+ LOGGER.warning("Unable to initialize the module " + this.module.getName() + " : " + e); |
||||
} |
||||
- else if (LOGGER.isWarnEnabled()) |
||||
+ else if (LOGGER.isLoggable(Level.WARNING)) |
||||
{ |
||||
- LOGGER.warn("Unable to initialize the module " + this.module.getName()); |
||||
+ LOGGER.warning("Unable to initialize the module " + this.module.getName()); |
||||
} |
||||
this.state = STATE_ERROR; |
||||
} |
||||
@@ -267,4 +267,4 @@ |
||||
{ |
||||
this.state = STATE_ERROR; |
||||
} |
||||
-} |
||||
\ No newline at end of file |
||||
+} |
||||
diff -ru libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/config/PropertyFileConfiguration.java libbase-1.1.3/source/org/pentaho/reporting/libraries/base/config/PropertyFileConfiguration.java |
||||
--- libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/config/PropertyFileConfiguration.java 2009-11-16 10:14:12.000000000 +0000 |
||||
+++ libbase-1.1.3/source/org/pentaho/reporting/libraries/base/config/PropertyFileConfiguration.java 2021-02-23 12:13:55.788194558 +0000 |
||||
@@ -22,8 +22,7 @@ |
||||
import java.io.InputStream; |
||||
import java.util.Properties; |
||||
|
||||
-import org.apache.commons.logging.Log; |
||||
-import org.apache.commons.logging.LogFactory; |
||||
+import java.util.logging.Logger; |
||||
import org.pentaho.reporting.libraries.base.util.ObjectUtilities; |
||||
|
||||
/** |
||||
@@ -34,7 +33,7 @@ |
||||
public class PropertyFileConfiguration extends HierarchicalConfiguration |
||||
{ |
||||
/** A logger for debug-messages. */ |
||||
- private static final Log LOGGER = LogFactory.getLog(PropertyFileConfiguration.class); |
||||
+ private static final Logger LOGGER = Logger.getLogger(PropertyFileConfiguration.class.getName()); |
||||
/** A serialization related constant. */ |
||||
private static final long serialVersionUID = 2423181637547944866L; |
||||
|
||||
@@ -89,7 +88,7 @@ |
||||
} |
||||
else |
||||
{ |
||||
- LOGGER.debug("Configuration file not found in the classpath: " + resourceName); |
||||
+ LOGGER.config("Configuration file not found in the classpath: " + resourceName); |
||||
} |
||||
|
||||
} |
||||
@@ -118,9 +117,9 @@ |
||||
} |
||||
catch (IOException ioe) |
||||
{ |
||||
- LOGGER.warn("Unable to read configuration", ioe); |
||||
+ LOGGER.warning("Unable to read configuration:" + ioe); |
||||
} |
||||
|
||||
} |
||||
|
||||
-} |
||||
\ No newline at end of file |
||||
+} |
||||
diff -ru libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/util/ClassQueryTool.java libbase-1.1.3/source/org/pentaho/reporting/libraries/base/util/ClassQueryTool.java |
||||
--- libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/util/ClassQueryTool.java 2009-11-16 10:14:12.000000000 +0000 |
||||
+++ libbase-1.1.3/source/org/pentaho/reporting/libraries/base/util/ClassQueryTool.java 2021-02-23 12:24:05.460991092 +0000 |
||||
@@ -26,8 +26,7 @@ |
||||
import java.util.zip.ZipEntry; |
||||
import java.util.zip.ZipInputStream; |
||||
|
||||
-import org.apache.commons.logging.Log; |
||||
-import org.apache.commons.logging.LogFactory; |
||||
+import java.util.logging.Logger; |
||||
|
||||
/** |
||||
* The class-query tool loads classes using a classloader and calls "processClass" for each class encountered. This is |
||||
@@ -41,7 +40,7 @@ |
||||
public abstract class ClassQueryTool |
||||
{ |
||||
/** A logger. */ |
||||
- private static final Log logger = LogFactory.getLog(ClassQueryTool.class); |
||||
+ private static final Logger logger = Logger.getLogger(ClassQueryTool.class.getName()); |
||||
|
||||
/** |
||||
* The default constructor. |
||||
@@ -89,7 +88,7 @@ |
||||
catch (Throwable e) |
||||
{ |
||||
// ignore .. |
||||
- logger.debug("At class '" + className + "': " + e); |
||||
+ logger.config("At class '" + className + "': " + e); |
||||
} |
||||
} |
||||
|
||||
@@ -137,7 +136,7 @@ |
||||
} |
||||
catch (final IOException e1) |
||||
{ |
||||
- logger.debug("Caught IO-Exception while processing file " + jarFile, e1); |
||||
+ logger.config("Caught IO-Exception while processing file " + jarFile + " : " + e1); |
||||
} |
||||
} |
||||
|
||||
@@ -225,7 +224,7 @@ |
||||
for (int i = 0; i < allArray.length; i++) |
||||
{ |
||||
final URL url = allArray[i]; |
||||
- logger.debug(url); |
||||
+ logger.config(url.toString()); |
||||
} |
||||
for (int i = 0; i < urlsArray.length; i++) |
||||
{ |
||||
diff -ru libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/util/DebugLog.java libbase-1.1.3/source/org/pentaho/reporting/libraries/base/util/DebugLog.java |
||||
--- libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/util/DebugLog.java 2009-11-16 10:14:12.000000000 +0000 |
||||
+++ libbase-1.1.3/source/org/pentaho/reporting/libraries/base/util/DebugLog.java 2021-02-23 12:26:00.488084723 +0000 |
||||
@@ -17,8 +17,7 @@ |
||||
|
||||
package org.pentaho.reporting.libraries.base.util; |
||||
|
||||
-import org.apache.commons.logging.Log; |
||||
-import org.apache.commons.logging.LogFactory; |
||||
+import java.util.logging.Logger; |
||||
|
||||
/** |
||||
* This class provides static log messages for on-going bug-hunting efforts. This removes the need to create |
||||
@@ -29,7 +28,7 @@ |
||||
public final class DebugLog |
||||
{ |
||||
/** A logger. */ |
||||
- private static final Log logger = LogFactory.getLog(DebugLog.class); |
||||
+ private static final Logger logger = Logger.getLogger(DebugLog.class.getName()); |
||||
|
||||
/** |
||||
* Logs a message using the debug-logger. By channeling all temporary log messages through this method, |
||||
@@ -39,7 +38,7 @@ |
||||
*/ |
||||
public static void log(final Object message) |
||||
{ |
||||
- logger.info(message); |
||||
+ logger.info(message.toString()); |
||||
} |
||||
|
||||
/** |
||||
@@ -51,7 +50,7 @@ |
||||
*/ |
||||
public static void log(final Object message, final Throwable t) |
||||
{ |
||||
- logger.info(message, t); |
||||
+ logger.info(message + " : " + t); |
||||
} |
||||
|
||||
/** |
||||
@@ -68,7 +67,7 @@ |
||||
public static void logHereWE() |
||||
{ |
||||
//noinspection ThrowableInstanceNeverThrown |
||||
- logger.info("HERE: Debug point reached", new Exception("Debug-Point reached")); |
||||
+ logger.info("HERE: Debug point reached"); |
||||
} |
||||
|
||||
/** |
||||
diff -ru libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/util/ObjectUtilities.java libbase-1.1.3/source/org/pentaho/reporting/libraries/base/util/ObjectUtilities.java |
||||
--- libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/util/ObjectUtilities.java 2009-11-16 10:14:12.000000000 +0000 |
||||
+++ libbase-1.1.3/source/org/pentaho/reporting/libraries/base/util/ObjectUtilities.java 2021-02-23 12:30:11.253468898 +0000 |
||||
@@ -29,8 +29,8 @@ |
||||
import java.util.Arrays; |
||||
import java.util.StringTokenizer; |
||||
|
||||
-import org.apache.commons.logging.Log; |
||||
-import org.apache.commons.logging.LogFactory; |
||||
+import java.util.logging.Level; |
||||
+import java.util.logging.Logger; |
||||
|
||||
/** |
||||
* A collection of useful static utility methods for handling classes and object instantiation. |
||||
@@ -39,7 +39,7 @@ |
||||
*/ |
||||
public final class ObjectUtilities |
||||
{ |
||||
- private static final Log LOGGER = LogFactory.getLog(ObjectUtilities.class); |
||||
+ private static final Logger LOGGER = Logger.getLogger(ObjectUtilities.class.getName()); |
||||
|
||||
/** |
||||
* A constant for using the TheadContext as source for the classloader. |
||||
@@ -180,15 +180,15 @@ |
||||
} |
||||
catch (NoSuchMethodException e) |
||||
{ |
||||
- LOGGER.warn("Object without clone() method is impossible on class " + aClass, e); |
||||
+ LOGGER.warning("Object without clone() method is impossible on class " + aClass + " : " + e); |
||||
} |
||||
catch (IllegalAccessException e) |
||||
{ |
||||
- LOGGER.warn("Object.clone(): unable to call method 'clone()' on class " + aClass, e); |
||||
+ LOGGER.warning("Object.clone(): unable to call method 'clone()' on class " + aClass + " : " + e); |
||||
} |
||||
catch (InvocationTargetException e) |
||||
{ |
||||
- LOGGER.warn("Object without clone() method is impossible on class " + aClass, e); |
||||
+ LOGGER.warning("Object without clone() method is impossible on class " + aClass + " : " + e); |
||||
} |
||||
throw new CloneNotSupportedException |
||||
("Failed to clone: Clone caused an Exception while cloning type " + aClass); |
||||
@@ -424,32 +424,32 @@ |
||||
if (type != null && type.isAssignableFrom(c) == false) |
||||
{ |
||||
// this is unacceptable and means someone messed up the configuration |
||||
- LOGGER.warn("Specified class " + className + " is not of expected type " + type); |
||||
+ LOGGER.warning("Specified class " + className + " is not of expected type " + type); |
||||
return null; |
||||
} |
||||
return c.newInstance(); |
||||
} |
||||
catch (ClassNotFoundException e) |
||||
{ |
||||
- if (LOGGER.isDebugEnabled()) |
||||
+ if (LOGGER.isLoggable(Level.CONFIG)) |
||||
{ |
||||
- LOGGER.debug("Specified class " + className + " does not exist."); |
||||
+ LOGGER.config("Specified class " + className + " does not exist."); |
||||
} |
||||
// sometimes, this one is expected. |
||||
} |
||||
catch (NoClassDefFoundError e) |
||||
{ |
||||
- if (LOGGER.isDebugEnabled()) |
||||
+ if (LOGGER.isLoggable(Level.CONFIG)) |
||||
{ |
||||
- LOGGER.debug("Specified class " + className + " cannot be loaded [NOCLASSDEFERROR]."); |
||||
+ LOGGER.config("Specified class " + className + " cannot be loaded [NOCLASSDEFERROR]."); |
||||
} |
||||
} |
||||
catch (Throwable e) |
||||
{ |
||||
// this is more severe than a class not being found at all |
||||
- if (LOGGER.isDebugEnabled()) |
||||
+ if (LOGGER.isLoggable(Level.CONFIG)) |
||||
{ |
||||
- LOGGER.info("Specified class " + className + " failed to instantiate correctly.", e); |
||||
+ LOGGER.info("Specified class " + className + " failed to instantiate correctly." + " : " + e); |
||||
} |
||||
else |
||||
{ |
||||
@@ -615,4 +615,4 @@ |
||||
} |
||||
return hashCode; |
||||
} |
||||
-} |
||||
\ No newline at end of file |
||||
+} |
||||
diff -ru libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/util/PngEncoder.java libbase-1.1.3/source/org/pentaho/reporting/libraries/base/util/PngEncoder.java |
||||
--- libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/util/PngEncoder.java 2009-11-16 10:14:12.000000000 +0000 |
||||
+++ libbase-1.1.3/source/org/pentaho/reporting/libraries/base/util/PngEncoder.java 2021-02-23 12:27:15.484797751 +0000 |
||||
@@ -27,8 +27,7 @@ |
||||
import java.util.zip.Deflater; |
||||
import java.util.zip.DeflaterOutputStream; |
||||
|
||||
-import org.apache.commons.logging.Log; |
||||
-import org.apache.commons.logging.LogFactory; |
||||
+import java.util.logging.Logger; |
||||
import org.pentaho.reporting.libraries.base.encoder.ImageEncoder; |
||||
import org.pentaho.reporting.libraries.base.encoder.UnsupportedEncoderException; |
||||
|
||||
@@ -66,7 +65,7 @@ |
||||
public class PngEncoder implements ImageEncoder |
||||
{ |
||||
/** A logger for debug-messages. */ |
||||
- private static final Log logger = LogFactory.getLog(PngEncoder.class); |
||||
+ private static final Logger logger = Logger.getLogger(PngEncoder.class.getName()); |
||||
|
||||
/** |
||||
* Constant specifying that alpha channel should be encoded. |
||||
@@ -622,12 +621,12 @@ |
||||
} |
||||
catch (Exception e) |
||||
{ |
||||
- logger.error("interrupted waiting for pixels!", e); |
||||
+ logger.severe("interrupted waiting for pixels: " + e); |
||||
return false; |
||||
} |
||||
if ((pg.getStatus() & ImageObserver.ABORT) != 0) |
||||
{ |
||||
- logger.error("image fetch aborted or errored"); |
||||
+ logger.severe("image fetch aborted or errored"); |
||||
return false; |
||||
} |
||||
|
||||
@@ -709,7 +708,7 @@ |
||||
} |
||||
catch (IOException e) |
||||
{ |
||||
- logger.error("Failed to write PNG Data", e); |
||||
+ logger.severe("Failed to write PNG Data:" + e); |
||||
return false; |
||||
} |
||||
} |
||||
diff -ru libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/util/ResourceBundleSupport.java libbase-1.1.3/source/org/pentaho/reporting/libraries/base/util/ResourceBundleSupport.java |
||||
--- libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/util/ResourceBundleSupport.java 2009-11-16 10:14:12.000000000 +0000 |
||||
+++ libbase-1.1.3/source/org/pentaho/reporting/libraries/base/util/ResourceBundleSupport.java 2021-02-23 12:27:45.015078518 +0000 |
||||
@@ -36,8 +36,7 @@ |
||||
import javax.swing.JMenu; |
||||
import javax.swing.KeyStroke; |
||||
|
||||
-import org.apache.commons.logging.Log; |
||||
-import org.apache.commons.logging.LogFactory; |
||||
+import java.util.logging.Logger; |
||||
|
||||
/** |
||||
* An utility class to ease up using property-file resource bundles. |
||||
@@ -60,7 +59,7 @@ |
||||
/** |
||||
* A logger for debug-messages. |
||||
*/ |
||||
- private static final Log logger = LogFactory.getLog(ResourceBundleSupport.class); |
||||
+ private static final Logger logger = Logger.getLogger(ResourceBundleSupport.class.getName()); |
||||
|
||||
/** |
||||
* The resource bundle that will be used for local lookups. |
||||
@@ -259,7 +258,7 @@ |
||||
} |
||||
catch (Exception e) |
||||
{ |
||||
- logger.error("Error during global lookup", e); |
||||
+ logger.severe("Error during global lookup: " + e); |
||||
throw new MissingResourceException("Error during global lookup", getResourceBase(), key); |
||||
} |
||||
} |
||||
@@ -643,7 +642,7 @@ |
||||
final URL in = ObjectUtilities.getResource(name, ResourceBundleSupport.class); |
||||
if (in == null) |
||||
{ |
||||
- logger.warn("Unable to find file in the class path: " + name + "; key=" + key); |
||||
+ logger.warning("Unable to find file in the class path: " + name + "; key=" + key); |
||||
} |
||||
return in; |
||||
} |
||||
@@ -668,13 +667,13 @@ |
||||
|
||||
if (in == null) |
||||
{ |
||||
- logger.warn("Unable to find file in the class path: " + resourceName); |
||||
+ logger.warning("Unable to find file in the class path: " + resourceName); |
||||
return new ImageIcon(createTransparentImage(1, 1)); |
||||
} |
||||
final Image img = Toolkit.getDefaultToolkit().createImage(in); |
||||
if (img == null) |
||||
{ |
||||
- logger.warn("Unable to instantiate the image: " + resourceName); |
||||
+ logger.warning("Unable to instantiate the image: " + resourceName); |
||||
return new ImageIcon(createTransparentImage(1, 1)); |
||||
} |
||||
if (scale) |
||||
diff -ru libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/util/WaitingImageObserver.java libbase-1.1.3/source/org/pentaho/reporting/libraries/base/util/WaitingImageObserver.java |
||||
--- libbase-1.1.3.orig/source/org/pentaho/reporting/libraries/base/util/WaitingImageObserver.java 2009-11-16 10:14:12.000000000 +0000 |
||||
+++ libbase-1.1.3/source/org/pentaho/reporting/libraries/base/util/WaitingImageObserver.java 2021-02-23 12:30:28.223630238 +0000 |
||||
@@ -22,8 +22,7 @@ |
||||
import java.awt.image.BufferedImage; |
||||
import java.awt.image.ImageObserver; |
||||
|
||||
-import org.apache.commons.logging.Log; |
||||
-import org.apache.commons.logging.LogFactory; |
||||
+import java.util.logging.Logger; |
||||
|
||||
/** |
||||
* This image observer blocks until the image is completely loaded. AWT defers the loading of images until they are |
||||
@@ -37,7 +36,7 @@ |
||||
public class WaitingImageObserver implements ImageObserver |
||||
{ |
||||
/** A logger. */ |
||||
- private static final Log LOGGER = LogFactory.getLog(WaitingImageObserver.class); |
||||
+ private static final Logger LOGGER = Logger.getLogger(WaitingImageObserver.class.getName()); |
||||
|
||||
/** |
||||
* For serialization. |
||||
@@ -149,7 +148,7 @@ |
||||
} |
||||
catch (InterruptedException e) |
||||
{ |
||||
- LOGGER.info("WaitingImageObserver.waitImageLoaded(): InterruptedException thrown", e); |
||||
+ LOGGER.info("WaitingImageObserver.waitImageLoaded(): InterruptedException thrown: " + e); |
||||
} |
||||
} |
||||
} |
||||
@@ -172,4 +171,4 @@ |
||||
{ |
||||
return this.error; |
||||
} |
||||
-} |
||||
\ No newline at end of file |
||||
+} |
@ -0,0 +1,163 @@
@@ -0,0 +1,163 @@
|
||||
Name: libbase |
||||
Version: 1.1.3 |
||||
Release: 31%{?dist} |
||||
Summary: JFree Base Services |
||||
License: LGPLv2 |
||||
#Original source: http://downloads.sourceforge.net/jfreereport/%%{name}-%%{version}.zip |
||||
#unzip, find . -name "*.jar" -exec rm {} \; |
||||
#to simplify the licensing |
||||
Source: %{name}-%{version}-jarsdeleted.zip |
||||
URL: http://reporting.pentaho.org/ |
||||
BuildRequires: ant, java-devel, jpackage-utils |
||||
Requires: java-headless, jpackage-utils |
||||
BuildArch: noarch |
||||
|
||||
Patch0: libbase-1.1.2.build.patch |
||||
Patch1: libbase-1.1.2.java11.patch |
||||
Patch2: libbase-1.1.3-remove-antcontrib-support.patch |
||||
Patch3: libbase-1.1.3-remove-commons-logging.patch |
||||
|
||||
%description |
||||
LibBase is a library developed to provide base services like logging, |
||||
configuration and initialization to other libraries and applications. The |
||||
library is the root library for all Pentaho-Reporting projects. |
||||
|
||||
%package javadoc |
||||
Summary: Javadoc for %{name} |
||||
Requires: %{name} = %{version}-%{release} |
||||
Requires: jpackage-utils |
||||
|
||||
%description javadoc |
||||
Javadoc for %{name}. |
||||
|
||||
%prep |
||||
%setup -q -c |
||||
%patch0 -p1 -b .build |
||||
%patch1 -p1 -b .java11 |
||||
%patch2 -p1 -b .no_antcontrib |
||||
%patch3 -p1 -b .no_commons_logging |
||||
|
||||
find . -name "*.jar" -exec rm -f {} \; |
||||
|
||||
%build |
||||
ant jar javadoc |
||||
|
||||
%install |
||||
mkdir -p $RPM_BUILD_ROOT%{_javadir} |
||||
cp -p ./dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar |
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} |
||||
cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name} |
||||
|
||||
%files |
||||
%doc ChangeLog.txt licence-LGPL.txt README.txt |
||||
%{_javadir}/%{name}.jar |
||||
|
||||
%files javadoc |
||||
%{_javadocdir}/%{name} |
||||
|
||||
%changelog |
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-31 |
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags |
||||
Related: rhbz#1991688 |
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-30 |
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 |
||||
|
||||
* Tue Feb 23 2021 Caolán McNamara <caolanm@redhat.com> - 1.1.3-29 |
||||
- Related: rhbz#1895921 replace apache-commons-logging with java.util.logging |
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-28 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild |
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-26 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild |
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.1.3-25 |
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 |
||||
|
||||
* Tue May 05 2020 Caolán McNamara <caolanm@redhat.com> - 1.1.3-24 |
||||
- allow rebuild with java 11 |
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-23 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild |
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-22 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild |
||||
|
||||
* Wed Apr 03 2019 Stephan Bergmann <sbergman@redhat.com> - 1.1.3-21 |
||||
- Use /usr/share/java instead of %{_javadir} for build dependencies |
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-20 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild |
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-19 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild |
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-18 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild |
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-17 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild |
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-16 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild |
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-15 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild |
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-14 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild |
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-13 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild |
||||
|
||||
* Tue Feb 25 2014 Caolán McNamara <caolanm@redhat.com> - 1.1.3-12 |
||||
- Resolves: rhbz#1068349 Switch to java-headless (build)requires |
||||
|
||||
* Wed Oct 23 2013 Caolán McNamara <caolanm@redhat.com> - 1.1.3-11 |
||||
- Resolves: rhbz#1022130 remove versioned jars |
||||
|
||||
* Tue Aug 06 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.1.3-10 |
||||
- Fix bogus date in %%changelog |
||||
- ant-nodeps is dropped from ant-1.9.0-2 build in rawhide |
||||
- Drop buildroot, %%clean, %%defattr and removal of buildroot in %%install |
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-9 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild |
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-8 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild |
||||
|
||||
* Sat Nov 03 2012 Caolán McNamara <caolanm@redhat.com> - 1.1.3-7 |
||||
- repack source to remove bundled multi-license .jars |
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-6 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild |
||||
|
||||
* Thu May 03 2012 Caolán McNamara <caolanm@redhat.com> - 1.1.3-5 |
||||
- Resolves: rhbz#818487 adapt to jakarta->apache |
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-4 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild |
||||
|
||||
* Fri Oct 28 2011 Caolán McNamara <caolanm@redhat.com> - 1.1.3-3 |
||||
- Related: rhbz#749103 drop gcj aot |
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild |
||||
|
||||
* Thu Dec 03 2009 Caolan McNamara <caolanm@redhat.com> 1.1.3-1 |
||||
- latest version |
||||
|
||||
* Tue Nov 17 2009 Caolan McNamara <caolanm@redhat.com> 1.1.2-1 |
||||
- latest version |
||||
|
||||
* Fri Jul 24 2009 Caolan McNamara <caolanm@redhat.com> 1.0.0-3.OOo31 |
||||
- make javadoc no-arch when building as arch-dependant aot |
||||
|
||||
* Mon Mar 16 2009 Caolan McNamara <caolanm@redhat.com> 1.0.0-2.OOo31 |
||||
- Post released tuned for OpenOffice.org reportbuilder |
||||
|
||||
* Wed Dec 03 2008 Caolan McNamara <caolanm@redhat.com> 1.0.0-1 |
||||
- initial fedora import |
Loading…
Reference in new issue