rebuilt with ant and java 11 [release 1.1.3-3mamba;Fri Dec 10 2021]
This commit is contained in:
parent
8f43bdc801
commit
ec10b357a7
17
java-pentaho-libxml-1.1.3-build.patch
Normal file
17
java-pentaho-libxml-1.1.3-build.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
--- pentaho-libxml-1.1.3/build.properties 2009-11-17 15:20:48.000000000 +0000
|
||||||
|
+++ pentaho-libxml-1.1.3/build.properties 2009-11-17 15:20:57.000000000 +0000
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-project.revision=TRUNK-SNAPSHOT
|
||||||
|
+project.revision=1.1.3
|
||||||
|
ivy.artifact.group=pentaho-library
|
||||||
|
ivy.artifact.id=libxml
|
||||||
|
impl.title=LibXml
|
||||||
|
@@ -6,4 +6,6 @@
|
||||||
|
src.dir=${basedir}/source
|
||||||
|
dependency.libbase.revision=1.1.3
|
||||||
|
dependency.libloader.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
|
||||||
13
java-pentaho-libxml-1.1.3-java11.patch
Normal file
13
java-pentaho-libxml-1.1.3-java11.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
--- pentaho-libxml-1.1.3/common_build.xml 2020-05-05 20:04:44.314203763 +0100
|
||||||
|
+++ pentaho-libxml-1.1.3/common_build.xml 2020-05-05 20:04:51.959264419 +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.8" description="Provide source compatibility with specified release" />
|
||||||
|
+ <property name="javac.target" value="1.8" description="Generate class files for specific VM version" />
|
||||||
|
|
||||||
|
<!-- Build Cache properties -->
|
||||||
|
<property name="build.cache.dir"
|
||||||
229
java-pentaho-libxml-1.1.3-remove-antcontrib-support.patch
Normal file
229
java-pentaho-libxml-1.1.3-remove-antcontrib-support.patch
Normal file
@ -0,0 +1,229 @@
|
|||||||
|
diff -ru pentaho-libxml-1.1.3.orig/common_build.xml pentaho-libxml-1.1.3/common_build.xml
|
||||||
|
--- pentaho-libxml-1.1.3.orig/common_build.xml 2021-06-28 17:28:26.396270761 +0100
|
||||||
|
+++ pentaho-libxml-1.1.3/common_build.xml 2021-06-28 17:32:01.697273657 +0100
|
||||||
|
@@ -152,9 +152,6 @@
|
||||||
|
<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" />
|
||||||
|
@@ -326,68 +323,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
<!--=======================================================================
|
||||||
|
- 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
|
||||||
|
|
||||||
|
Ensures that all the required directories exist before processing
|
||||||
|
@@ -445,7 +380,7 @@
|
||||||
|
(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>
|
||||||
|
@@ -492,57 +427,12 @@
|
||||||
|
|
||||||
|
|
||||||
|
<!--=======================================================================
|
||||||
|
- 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 @@
|
||||||
|
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 @@
|
||||||
|
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}" />
|
||||||
|
@@ -1078,30 +968,12 @@
|
||||||
|
<!--=======================================================================
|
||||||
|
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.
|
||||||
|
+ Copies any needed resources into the classes directory.
|
||||||
|
====================================================================-->
|
||||||
|
- <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 name="compile.res_copy">
|
||||||
|
+ <copy todir="${classes.dir}" flatten="false">
|
||||||
|
+ <fileset dir="${src.dir}" excludes="**/*.java" />
|
||||||
|
+ </copy>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
|
||||||
|
@@ -1151,7 +1023,7 @@
|
||||||
|
|
||||||
|
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>
|
||||||
|
@@ -1164,7 +1036,7 @@
|
||||||
|
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">
|
||||||
|
+ <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" />
|
||||||
|
@@ -1648,4 +1520,4 @@
|
||||||
|
</dot-classpath>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
-</project>
|
||||||
|
\ No newline at end of file
|
||||||
|
+</project>
|
||||||
269
java-pentaho-libxml-1.1.3-remove-commons-logging.patch
Normal file
269
java-pentaho-libxml-1.1.3-remove-commons-logging.patch
Normal file
@ -0,0 +1,269 @@
|
|||||||
|
diff -ru pentaho-libxml-1.1.3.orig/source/org/pentaho/reporting/libraries/xmlns/parser/AbstractXmlReadHandler.java pentaho-libxml-1.1.3/source/org/pentaho/reporting/libraries/xmlns/parser/AbstractXmlReadHandler.java
|
||||||
|
--- pentaho-libxml-1.1.3.orig/source/org/pentaho/reporting/libraries/xmlns/parser/AbstractXmlReadHandler.java 2021-04-07 11:34:22.313653786 +0100
|
||||||
|
+++ pentaho-libxml-1.1.3/source/org/pentaho/reporting/libraries/xmlns/parser/AbstractXmlReadHandler.java 2021-04-07 11:48:16.381234640 +0100
|
||||||
|
@@ -20,8 +20,8 @@
|
||||||
|
import java.util.HashMap;
|
||||||
|
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.resourceloader.DependencyCollector;
|
||||||
|
import org.pentaho.reporting.libraries.resourceloader.FactoryParameterKey;
|
||||||
|
import org.pentaho.reporting.libraries.resourceloader.Resource;
|
||||||
|
@@ -40,7 +40,7 @@
|
||||||
|
*/
|
||||||
|
public abstract class AbstractXmlReadHandler implements XmlReadHandler
|
||||||
|
{
|
||||||
|
- private static final Log logger = LogFactory.getLog(AbstractXmlReadHandler.class);
|
||||||
|
+ private static final Logger logger = Logger.getLogger(AbstractXmlReadHandler.class.getName());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The root handler.
|
||||||
|
@@ -120,8 +120,8 @@
|
||||||
|
final XmlReadHandler childHandler = getHandlerForChild(uri, tagName, attrs);
|
||||||
|
if (childHandler == null)
|
||||||
|
{
|
||||||
|
- logger.warn("Unknown tag <" + uri + ':' + tagName + ">: Start to ignore this element and all of its childs. " + getLocatorString());
|
||||||
|
- logger.debug(this.getClass());
|
||||||
|
+ logger.warning("Unknown tag <" + uri + ':' + tagName + ">: Start to ignore this element and all of its childs. " + getLocatorString());
|
||||||
|
+ logger.config(this.getClass().getName());
|
||||||
|
final IgnoreAnyChildReadHandler ignoreAnyChildReadHandler =
|
||||||
|
new IgnoreAnyChildReadHandler();
|
||||||
|
ignoreAnyChildReadHandler.init(getRootHandler(), uri, tagName);
|
||||||
|
diff -ru pentaho-libxml-1.1.3.orig/source/org/pentaho/reporting/libraries/xmlns/parser/AbstractXmlResourceFactory.java pentaho-libxml-1.1.3/source/org/pentaho/reporting/libraries/xmlns/parser/AbstractXmlResourceFactory.java
|
||||||
|
--- pentaho-libxml-1.1.3.orig/source/org/pentaho/reporting/libraries/xmlns/parser/AbstractXmlResourceFactory.java 2021-04-07 11:34:22.313653786 +0100
|
||||||
|
+++ pentaho-libxml-1.1.3/source/org/pentaho/reporting/libraries/xmlns/parser/AbstractXmlResourceFactory.java 2021-04-07 11:44:15.729203631 +0100
|
||||||
|
@@ -26,8 +26,7 @@
|
||||||
|
import javax.xml.parsers.SAXParser;
|
||||||
|
import javax.xml.parsers.SAXParserFactory;
|
||||||
|
|
||||||
|
-import org.apache.commons.logging.Log;
|
||||||
|
-import org.apache.commons.logging.LogFactory;
|
||||||
|
+import java.util.logging.Logger;
|
||||||
|
import org.pentaho.reporting.libraries.resourceloader.CompoundResource;
|
||||||
|
import org.pentaho.reporting.libraries.resourceloader.FactoryParameterKey;
|
||||||
|
import org.pentaho.reporting.libraries.resourceloader.Resource;
|
||||||
|
@@ -56,7 +55,7 @@
|
||||||
|
*/
|
||||||
|
public abstract class AbstractXmlResourceFactory implements ResourceFactory
|
||||||
|
{
|
||||||
|
- private static final Log logger = LogFactory.getLog(AbstractXmlResourceFactory.class);
|
||||||
|
+ private static final Logger logger = Logger.getLogger(AbstractXmlResourceFactory.class.getName());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A key for the content base.
|
||||||
|
@@ -115,7 +114,7 @@
|
||||||
|
}
|
||||||
|
catch (SAXException se)
|
||||||
|
{
|
||||||
|
- logger.debug("Comments are not supported by this SAX implementation.");
|
||||||
|
+ logger.config("Comments are not supported by this SAX implementation.");
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
@@ -133,7 +132,7 @@
|
||||||
|
}
|
||||||
|
catch (SAXException e)
|
||||||
|
{
|
||||||
|
- logger.warn("No Namespace features will be available. (Yes, this is serious)");
|
||||||
|
+ logger.warning("No Namespace features will be available. (Yes, this is serious)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -ru pentaho-libxml-1.1.3.orig/source/org/pentaho/reporting/libraries/xmlns/parser/DomTreeResourceFactory.java pentaho-libxml-1.1.3/source/org/pentaho/reporting/libraries/xmlns/parser/DomTreeResourceFactory.java
|
||||||
|
--- pentaho-libxml-1.1.3.orig/source/org/pentaho/reporting/libraries/xmlns/parser/DomTreeResourceFactory.java 2021-04-07 11:34:22.314653798 +0100
|
||||||
|
+++ pentaho-libxml-1.1.3/source/org/pentaho/reporting/libraries/xmlns/parser/DomTreeResourceFactory.java 2021-04-07 11:43:15.934442890 +0100
|
||||||
|
@@ -22,8 +22,7 @@
|
||||||
|
import javax.xml.parsers.DocumentBuilderFactory;
|
||||||
|
import javax.xml.parsers.ParserConfigurationException;
|
||||||
|
|
||||||
|
-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.ResourceCreationException;
|
||||||
|
import org.pentaho.reporting.libraries.resourceloader.ResourceData;
|
||||||
|
@@ -61,7 +60,7 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- private static final Log logger = LogFactory.getLog(DomTreeResourceFactory.class);
|
||||||
|
+ private static final Logger logger = Logger.getLogger(DomTreeResourceFactory.class.getName());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a resource by interpreting the data given in the resource-data object. If additional datastreams need to
|
||||||
|
diff -ru pentaho-libxml-1.1.3.orig/source/org/pentaho/reporting/libraries/xmlns/parser/LoggingErrorHandler.java pentaho-libxml-1.1.3/source/org/pentaho/reporting/libraries/xmlns/parser/LoggingErrorHandler.java
|
||||||
|
--- pentaho-libxml-1.1.3.orig/source/org/pentaho/reporting/libraries/xmlns/parser/LoggingErrorHandler.java 2021-04-07 11:34:22.313653786 +0100
|
||||||
|
+++ pentaho-libxml-1.1.3/source/org/pentaho/reporting/libraries/xmlns/parser/LoggingErrorHandler.java 2021-04-07 11:49:49.117390246 +0100
|
||||||
|
@@ -17,8 +17,8 @@
|
||||||
|
|
||||||
|
package org.pentaho.reporting.libraries.xmlns.parser;
|
||||||
|
|
||||||
|
-import org.apache.commons.logging.Log;
|
||||||
|
-import org.apache.commons.logging.LogFactory;
|
||||||
|
+import java.util.logging.Level;
|
||||||
|
+import java.util.logging.Logger;
|
||||||
|
import org.xml.sax.ErrorHandler;
|
||||||
|
import org.xml.sax.SAXException;
|
||||||
|
import org.xml.sax.SAXParseException;
|
||||||
|
@@ -30,9 +30,9 @@
|
||||||
|
*/
|
||||||
|
public class LoggingErrorHandler implements ErrorHandler
|
||||||
|
{
|
||||||
|
- private static final Log defaultLogContext = LogFactory.getLog(LoggingErrorHandler.class);
|
||||||
|
+ private static final Logger defaultLogContext = Logger.getLogger(LoggingErrorHandler.class.getName());
|
||||||
|
/** @noinspection NonConstantLogger*/
|
||||||
|
- private Log logContext;
|
||||||
|
+ private Logger logContext;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default-Constructor. Logs to a logger configured with this class name as category.
|
||||||
|
@@ -47,7 +47,7 @@
|
||||||
|
*
|
||||||
|
* @param logContext the logger that should receive the messages.
|
||||||
|
*/
|
||||||
|
- public LoggingErrorHandler(final Log logContext)
|
||||||
|
+ public LoggingErrorHandler(final Logger logContext)
|
||||||
|
{
|
||||||
|
if (logContext == null)
|
||||||
|
{
|
||||||
|
@@ -78,7 +78,7 @@
|
||||||
|
*/
|
||||||
|
public void warning(final SAXParseException exception) throws SAXException
|
||||||
|
{
|
||||||
|
- if (logContext.isDebugEnabled())
|
||||||
|
+ if (logContext.isLoggable(Level.CONFIG))
|
||||||
|
{
|
||||||
|
if (exception.getMessage().startsWith("URI was not reported to parser for entity"))
|
||||||
|
{
|
||||||
|
@@ -86,7 +86,7 @@
|
||||||
|
// the GNU thing complain about it ..
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
- logContext.debug("Parser-Warning", exception);
|
||||||
|
+ logContext.severe("Parser-Warning: " + exception.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -115,15 +115,15 @@
|
||||||
|
*/
|
||||||
|
public void error(final SAXParseException exception) throws SAXException
|
||||||
|
{
|
||||||
|
- if (logContext.isWarnEnabled())
|
||||||
|
+ if (logContext.isLoggable(Level.WARNING))
|
||||||
|
{
|
||||||
|
- if (logContext.isDebugEnabled())
|
||||||
|
+ if (logContext.isLoggable(Level.CONFIG))
|
||||||
|
{
|
||||||
|
- logContext.warn("Recoverable Parser-Error", exception);
|
||||||
|
+ logContext.warning("Recoverable Parser-Error:" + exception.getMessage());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- logContext.warn("Recoverable Parser-Error:" + exception.getMessage());
|
||||||
|
+ logContext.warning("Recoverable Parser-Error:" + exception.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -156,15 +156,15 @@
|
||||||
|
*/
|
||||||
|
public void fatalError(final SAXParseException exception) throws SAXException
|
||||||
|
{
|
||||||
|
- if (logContext.isErrorEnabled())
|
||||||
|
+ if (logContext.isLoggable(Level.SEVERE))
|
||||||
|
{
|
||||||
|
- if (logContext.isDebugEnabled())
|
||||||
|
+ if (logContext.isLoggable(Level.CONFIG))
|
||||||
|
{
|
||||||
|
- logContext.error("Fatal Parser-Error", exception);
|
||||||
|
+ logContext.severe("Fatal Parser-Error:" + exception.getMessage());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- logContext.error("Fatal Parser-Error:" + exception.getMessage());
|
||||||
|
+ logContext.severe("Fatal Parser-Error:" + exception.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff -ru pentaho-libxml-1.1.3.orig/source/org/pentaho/reporting/libraries/xmlns/parser/ParserEntityResolver.java pentaho-libxml-1.1.3/source/org/pentaho/reporting/libraries/xmlns/parser/ParserEntityResolver.java
|
||||||
|
--- pentaho-libxml-1.1.3.orig/source/org/pentaho/reporting/libraries/xmlns/parser/ParserEntityResolver.java 2021-04-07 11:34:22.314653798 +0100
|
||||||
|
+++ pentaho-libxml-1.1.3/source/org/pentaho/reporting/libraries/xmlns/parser/ParserEntityResolver.java 2021-04-07 11:43:45.602820344 +0100
|
||||||
|
@@ -22,8 +22,7 @@
|
||||||
|
import java.net.URL;
|
||||||
|
import java.util.HashMap;
|
||||||
|
|
||||||
|
-import org.apache.commons.logging.Log;
|
||||||
|
-import org.apache.commons.logging.LogFactory;
|
||||||
|
+import java.util.logging.Logger;
|
||||||
|
import org.xml.sax.EntityResolver;
|
||||||
|
import org.xml.sax.InputSource;
|
||||||
|
|
||||||
|
@@ -34,7 +33,7 @@
|
||||||
|
*/
|
||||||
|
public final class ParserEntityResolver implements EntityResolver
|
||||||
|
{
|
||||||
|
- private static final Log logger = LogFactory.getLog(ParserEntityResolver.class);
|
||||||
|
+ private static final Logger logger = Logger.getLogger(ParserEntityResolver.class.getName());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The hashtable for the known entities (deprecated DTDs).
|
||||||
|
@@ -75,7 +74,7 @@
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- logger.warn("Validate location failed for " + publicID + " location: " + location);
|
||||||
|
+ logger.warning("Validate location failed for " + publicID + " location: " + location);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -101,7 +100,7 @@
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- logger.warn("Validate location failed for " + publicID + " location: " + location);
|
||||||
|
+ logger.warning("Validate location failed for " + publicID + " location: " + location);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -195,7 +194,7 @@
|
||||||
|
}
|
||||||
|
catch (IOException ioe)
|
||||||
|
{
|
||||||
|
- logger.warn("Unable to open specified DTD", ioe);
|
||||||
|
+ logger.warning("Unable to open specified DTD: " + ioe);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
diff -ru pentaho-libxml-1.1.3.orig/source/org/pentaho/reporting/libraries/xmlns/parser/ResourceDataInputSource.java pentaho-libxml-1.1.3/source/org/pentaho/reporting/libraries/xmlns/parser/ResourceDataInputSource.java
|
||||||
|
--- pentaho-libxml-1.1.3.orig/source/org/pentaho/reporting/libraries/xmlns/parser/ResourceDataInputSource.java 2021-04-07 11:34:22.312653773 +0100
|
||||||
|
+++ pentaho-libxml-1.1.3/source/org/pentaho/reporting/libraries/xmlns/parser/ResourceDataInputSource.java 2021-04-07 11:44:05.484073284 +0100
|
||||||
|
@@ -20,8 +20,7 @@
|
||||||
|
import java.io.InputStream;
|
||||||
|
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.ResourceLoadingException;
|
||||||
|
import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
|
||||||
|
@@ -34,7 +33,7 @@
|
||||||
|
*/
|
||||||
|
public class ResourceDataInputSource extends InputSource
|
||||||
|
{
|
||||||
|
- private static final Log logger = LogFactory.getLog(ResourceDataInputSource.class);
|
||||||
|
+ private static final Logger logger = Logger.getLogger(ResourceDataInputSource.class.getName());
|
||||||
|
private ResourceData data;
|
||||||
|
private long version;
|
||||||
|
private ResourceManager caller;
|
||||||
|
@@ -103,7 +102,7 @@
|
||||||
|
}
|
||||||
|
catch (ResourceLoadingException e)
|
||||||
|
{
|
||||||
|
- logger.error("Unable to create byte-stream: " + data.getKey());
|
||||||
|
+ logger.severe("Unable to create byte-stream: " + data.getKey());
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
%define javahome %{_jvmdir}/jdk
|
%define javahome %{_jvmdir}/jdk
|
||||||
Name: java-pentaho-libxml
|
Name: java-pentaho-libxml
|
||||||
Version: 1.1.3
|
Version: 1.1.3
|
||||||
Release: 2mamba
|
Release: 3mamba
|
||||||
Summary: LibXML is a namespace aware SAX-Parser utility library
|
Summary: LibXML is a namespace aware SAX-Parser utility library
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
@ -9,19 +9,20 @@ Distribution: openmamba
|
|||||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||||
URL: https://sourceforge.net/projects/jfreereport/
|
URL: https://sourceforge.net/projects/jfreereport/
|
||||||
Source0: http://sourceforge.net/projects/jfreereport/files/02.%20Libraries/%{version}-stable/libxml-%{version}.zip
|
Source0: http://sourceforge.net/projects/jfreereport/files/02.%20Libraries/%{version}-stable/libxml-%{version}.zip
|
||||||
|
Patch0: java-pentaho-libxml-1.1.3-build.patch
|
||||||
|
Patch1: java-pentaho-libxml-1.1.3-java11.patch
|
||||||
|
Patch2: java-pentaho-libxml-1.1.3-remove-antcontrib-support.patch
|
||||||
|
Patch3: java-pentaho-libxml-1.1.3-remove-commons-logging.patch
|
||||||
License: LGPL
|
License: LGPL
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
## AUTOBUILDREQ-END
|
## AUTOBUILDREQ-END
|
||||||
BuildRequires: javapackages
|
BuildRequires: javapackages
|
||||||
|
BuildRequires: apache-ant
|
||||||
|
BuildRequires: java-jfree-libbase
|
||||||
|
BuildRequires: java-jfree-libloader
|
||||||
Requires: javapackages
|
Requires: javapackages
|
||||||
Provides: java-jfree-libbase
|
Requires: java-jfree-libbase
|
||||||
Obsoletes: java-jfree-libbase <= 1.1.3-1mamba
|
Requires: java-jfree-libloader
|
||||||
Provides: java-jfree-libloader
|
|
||||||
Obsoletes: java-jfree-libloader <= 1.1.3-1mamba
|
|
||||||
Provides: java-jfree-libxml
|
|
||||||
Obsoletes: java-jfree-libxml <= 1.1.3-1mamba
|
|
||||||
Provides: java-jfree-libpixie
|
|
||||||
Obsoletes: java-jfree-libpixie <= 1.1.3-1mamba
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
LibXML is a namespace aware SAX-Parser utility library. It eases the pain of implementing non-trivial SAX input handlers. The original code of these classes had been written by Peter Becker for the JCommon library.
|
LibXML is a namespace aware SAX-Parser utility library. It eases the pain of implementing non-trivial SAX input handlers. The original code of these classes had been written by Peter Becker for the JCommon library.
|
||||||
@ -38,21 +39,26 @@ This package contains documentation for %{name}.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -c
|
%setup -q -c
|
||||||
|
%patch0 -p1 -b .build
|
||||||
|
%patch1 -p1 -b .java11
|
||||||
|
%patch2 -p1 -b .remove-antcontrib-support
|
||||||
|
%patch3 -p1 -b .remove-commons-logging
|
||||||
|
|
||||||
|
find . -name "*.jar" -exec rm -f {} \;
|
||||||
|
mkdir -p lib
|
||||||
|
build-jar-repository -s -p lib libbase libloader
|
||||||
|
cd lib
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
ant jar javadoc
|
||||||
|
|
||||||
%install
|
%install
|
||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_javadir}
|
mkdir -p %{buildroot}%{_javadir}
|
||||||
install -pm 644 libxml-%{version}.jar %{buildroot}%{_javadir}/libxml-%{version}.jar
|
install -pm 644 dist/libxml-%{version}.jar %{buildroot}%{_javadir}/libxml-%{version}.jar
|
||||||
ln -sf libxml-%{version}.jar %{buildroot}%{_javadir}/libxml.jar
|
ln -sf libxml-%{version}.jar %{buildroot}%{_javadir}/libxml.jar
|
||||||
|
|
||||||
for f in libbase libloader libpixie; do
|
|
||||||
install -pm 644 lib/${f}-%{version}.jar %{buildroot}%{_javadir}/${f}-%{version}.jar
|
|
||||||
ln -sf ${f}-%{version}.jar %{buildroot}%{_javadir}/${f}.jar
|
|
||||||
done
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
|
|
||||||
@ -60,15 +66,12 @@ done
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_javadir}/libxml-%{version}.jar
|
%{_javadir}/libxml-%{version}.jar
|
||||||
%{_javadir}/libxml.jar
|
%{_javadir}/libxml.jar
|
||||||
%{_javadir}/libbase-%{version}.jar
|
|
||||||
%{_javadir}/libbase.jar
|
|
||||||
%{_javadir}/libloader-%{version}.jar
|
|
||||||
%{_javadir}/libloader.jar
|
|
||||||
%{_javadir}/libpixie-%{version}.jar
|
|
||||||
%{_javadir}/libpixie.jar
|
|
||||||
%doc licence-LGPL.txt
|
%doc licence-LGPL.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 10 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.3-3mamba
|
||||||
|
- rebuilt with ant and java 11
|
||||||
|
|
||||||
* Thu Dec 02 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.3-2mamba
|
* Thu Dec 02 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.3-2mamba
|
||||||
- restored
|
- restored
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user