rebuilt without gcj and with java 11 [release 1.1.3-2mamba;Fri Dec 10 2021]
This commit is contained in:
parent
4c5b1fea3c
commit
bccdbc575f
@ -1,8 +1,6 @@
|
|||||||
# java-jfree-librepository
|
# java-jfree-librepository
|
||||||
|
|
||||||
LibRepository provides a simple abstraction layer to access bulk content that is organized in a hierarchical layer.
|
LibRepository provides a simple abstraction layer to access bulk content that is organized in a hierarchical layer.
|
||||||
|
|
||||||
Unlike the JSR-000170, this library does not aim to solve all problems associated with content storages. The main purpose of LibRepository is to give users an astract view over an filesystem like structure so that content generator and content consumer do no longer have to make assumptions about where to store the generated content.
|
Unlike the JSR-000170, this library does not aim to solve all problems associated with content storages. The main purpose of LibRepository is to give users an astract view over an filesystem like structure so that content generator and content consumer do no longer have to make assumptions about where to store the generated content.
|
||||||
|
|
||||||
The repositories described here should not be used to store other things than BLOBs.
|
The repositories described here should not be used to store other things than BLOBs.
|
||||||
|
|
||||||
|
|||||||
40
java-jfree-librepository-1.1.3-build.patch
Normal file
40
java-jfree-librepository-1.1.3-build.patch
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
--- librepository-1.1.3/build.properties 2009-11-17 16:41:36.000000000 +0000
|
||||||
|
+++ librepository-1.1.3/build.properties 2009-11-17 16:41:56.000000000 +0000
|
||||||
|
@@ -1,7 +1,9 @@
|
||||||
|
-project.revision=TRUNK-SNAPSHOT
|
||||||
|
+project.revision=1.1.3
|
||||||
|
ivy.artifact.group=pentaho-library
|
||||||
|
ivy.artifact.id=librepository
|
||||||
|
impl.title=LibRepository
|
||||||
|
impl.productID=librepository
|
||||||
|
src.dir=${basedir}/source
|
||||||
|
dependency.libbase.revision=1.1.3
|
||||||
|
+antcontrib.available=true
|
||||||
|
+build.cache.dir=lib
|
||||||
|
--- librepository-1.1.3/common_build.xml 2009-11-17 20:34:29.000000000 +0000
|
||||||
|
+++ librepository-1.1.3/common_build.xml 2009-11-17 20:36:51.000000000 +0000
|
||||||
|
@@ -1071,6 +1071,7 @@
|
||||||
|
<path refid="classpath" />
|
||||||
|
</classpath>
|
||||||
|
<src path="${src.dir}" />
|
||||||
|
+ <exclude name="org/pentaho/reporting/libraries/repository/email/**"/>
|
||||||
|
</javac>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
@@ -1356,6 +1357,9 @@
|
||||||
|
doctitle="${impl.title} documentation">
|
||||||
|
<link href="http://java.sun.com/j2se/${javac.source}.0/docs/api/" />
|
||||||
|
<classpath refid="classpath" />
|
||||||
|
+ <packageset dir="source">
|
||||||
|
+ <exclude name="org/pentaho/reporting/libraries/repository/email/**"/>
|
||||||
|
+ </packageset>
|
||||||
|
</javadoc>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
@@ -1648,4 +1652,4 @@
|
||||||
|
</dot-classpath>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
-</project>
|
||||||
|
\ No hay ningún carácter de nueva línea al final del fichero
|
||||||
|
+</project>
|
||||||
@ -1,13 +0,0 @@
|
|||||||
--- build.properties 2009-11-16 10:24:36.000000000 +0100
|
|
||||||
+++ build.properties-gil 2011-01-22 16:29:14.000000000 +0100
|
|
||||||
@@ -1,7 +1,9 @@
|
|
||||||
-project.revision=TRUNK-SNAPSHOT
|
|
||||||
+project.revision=1.1.3
|
|
||||||
ivy.artifact.group=pentaho-library
|
|
||||||
ivy.artifact.id=librepository
|
|
||||||
impl.title=LibRepository
|
|
||||||
impl.productID=librepository
|
|
||||||
src.dir=${basedir}/source
|
|
||||||
dependency.libbase.revision=1.1.3
|
|
||||||
+antcontrib.available=true
|
|
||||||
+build.cache.dir=lib
|
|
||||||
79
java-jfree-librepository-1.1.3-java11.patch
Normal file
79
java-jfree-librepository-1.1.3-java11.patch
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
--- librepository-1.1.3/common_build.xml 2020-05-05 20:00:37.191243154 +0100
|
||||||
|
+++ librepository-1.1.3/common_build.xml 2020-05-05 20:00:44.344299905 +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"
|
||||||
|
@@ -1353,13 +1353,11 @@
|
||||||
|
nodeprecatedlist="false"
|
||||||
|
nodeprecated="false"
|
||||||
|
packagenames="${javadoc.packagenames}"
|
||||||
|
+ excludepackagenames="org.pentaho.reporting.libraries.repository.email.*"
|
||||||
|
sourcepath="${src.dir}"
|
||||||
|
doctitle="${impl.title} documentation">
|
||||||
|
<link href="http://java.sun.com/j2se/${javac.source}.0/docs/api/" />
|
||||||
|
<classpath refid="classpath" />
|
||||||
|
- <packageset dir="source">
|
||||||
|
- <exclude name="org/pentaho/reporting/libraries/repository/email/**"/>
|
||||||
|
- </packageset>
|
||||||
|
</javadoc>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
--- librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/ContentItem.java 2020-06-10 14:13:04.904250346 +0100
|
||||||
|
+++ librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/ContentItem.java 2020-06-10 14:12:10.686769515 +0100
|
||||||
|
@@ -43,7 +43,7 @@
|
||||||
|
* Tries to open and return a output stream for writing into the content item. This call will fail if the
|
||||||
|
* item is not writeable. Whether opening multiple output streams at the same time is possible is implementation
|
||||||
|
* dependent, but it is generally not recommended to try this.
|
||||||
|
- * <p/>
|
||||||
|
+ * <p>
|
||||||
|
* Having both an input and output stream open at the same time is not guaranteed to work. Generally if you need
|
||||||
|
* to append data, first open the inputstream and copy the content to a temporary location and then write the
|
||||||
|
* content along with the appended content to the new output stream.
|
||||||
|
@@ -58,7 +58,7 @@
|
||||||
|
* Tries to open and return a input stream for reading from the content item. This call will fail if the
|
||||||
|
* item is not readable. Whether opening multiple input streams at the same time is possible is implementation
|
||||||
|
* dependent.
|
||||||
|
- * <p/>
|
||||||
|
+ * <p>
|
||||||
|
* Having both an input and output stream open at the same time is not guaranteed to work. Generally if you need
|
||||||
|
* to append data, first open the inputstream and copy the content to a temporary location and then write the
|
||||||
|
* content along with the appended content to the new output stream.
|
||||||
|
--- librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/LibRepositoryBoot.java 2020-06-10 14:13:14.599336328 +0100
|
||||||
|
+++ librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/LibRepositoryBoot.java 2020-06-10 14:12:10.690769550 +0100
|
||||||
|
@@ -27,7 +27,7 @@
|
||||||
|
/**
|
||||||
|
* The LibRepositoryBoot class is used to initialize the library before it is
|
||||||
|
* first used. This loads all configurations and initializes all factories.
|
||||||
|
- * <p/>
|
||||||
|
+ * <p>
|
||||||
|
* Without booting, basic services like logging and the global configuration
|
||||||
|
* will not be availble.
|
||||||
|
*
|
||||||
|
--- librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/stream/StreamContentItem.java 2020-06-10 14:13:28.417458875 +0100
|
||||||
|
+++ librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/stream/StreamContentItem.java 2020-06-10 14:12:10.693769577 +0100
|
||||||
|
@@ -114,7 +114,7 @@
|
||||||
|
* Tries to open and return a output stream for writing into the content item. This call will fail if the
|
||||||
|
* item is not writeable. Whether opening multiple output streams at the same time is possible is implementation
|
||||||
|
* dependent, but it is generally not recommended to try this.
|
||||||
|
- * <p/>
|
||||||
|
+ * <p>
|
||||||
|
* Having both an input and output stream open at the same time is not guaranteed to work. Generally if you need
|
||||||
|
* to append data, first open the inputstream and copy the content to a temporary location and then write the
|
||||||
|
* content along with the appended content to the new output stream.
|
||||||
|
@@ -132,7 +132,7 @@
|
||||||
|
* Tries to open and return a input stream for reading from the content item. This call will fail if the
|
||||||
|
* item is not readable. Whether opening multiple input streams at the same time is possible is implementation
|
||||||
|
* dependent.
|
||||||
|
- * <p/>
|
||||||
|
+ * <p>
|
||||||
|
* Having both an input and output stream open at the same time is not guaranteed to work. Generally if you need
|
||||||
|
* to append data, first open the inputstream and copy the content to a temporary location and then write the
|
||||||
|
* content along with the appended content to the new output stream.
|
||||||
240
java-jfree-librepository-1.1.3-remove-ant-contrib-support.patch
Normal file
240
java-jfree-librepository-1.1.3-remove-ant-contrib-support.patch
Normal file
@ -0,0 +1,240 @@
|
|||||||
|
diff --git a/common_build.xml b/common_build.xml
|
||||||
|
index acdfad2..7ce88d9 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,37 +964,6 @@ TYPICAL TARGET SEQUENCE
|
||||||
|
</javac>
|
||||||
|
</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
|
||||||
|
|
||||||
|
@@ -1152,7 +1010,7 @@ 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>
|
||||||
|
@@ -1165,7 +1023,7 @@ TYPICAL TARGET SEQUENCE
|
||||||
|
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" />
|
||||||
117
java-jfree-librepository-1.1.3-remove-commons-logging.patch
Normal file
117
java-jfree-librepository-1.1.3-remove-commons-logging.patch
Normal file
@ -0,0 +1,117 @@
|
|||||||
|
diff -ru librepository-1.1.3.orig/source/org/pentaho/reporting/libraries/repository/zip/ZipContentLocation.java librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/zip/ZipContentLocation.java
|
||||||
|
--- librepository-1.1.3.orig/source/org/pentaho/reporting/libraries/repository/zip/ZipContentLocation.java 2021-04-07 11:16:05.369984495 +0100
|
||||||
|
+++ librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/zip/ZipContentLocation.java 2021-04-07 11:17:30.417035353 +0100
|
||||||
|
@@ -21,8 +21,7 @@
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.zip.ZipEntry;
|
||||||
|
|
||||||
|
-import org.apache.commons.logging.Log;
|
||||||
|
-import org.apache.commons.logging.LogFactory;
|
||||||
|
+import java.util.logging.Logger;
|
||||||
|
import org.pentaho.reporting.libraries.repository.ContentCreationException;
|
||||||
|
import org.pentaho.reporting.libraries.repository.ContentEntity;
|
||||||
|
import org.pentaho.reporting.libraries.repository.ContentIOException;
|
||||||
|
@@ -35,7 +34,7 @@
|
||||||
|
|
||||||
|
public class ZipContentLocation implements ContentLocation
|
||||||
|
{
|
||||||
|
- private static final Log logger = LogFactory.getLog(ZipContentLocation.class);
|
||||||
|
+ private static final Logger logger = Logger.getLogger(ZipContentLocation.class.getName());
|
||||||
|
private ZipRepository repository;
|
||||||
|
private ZipContentLocation parent;
|
||||||
|
private String comment;
|
||||||
|
@@ -114,7 +113,7 @@
|
||||||
|
final Object entry = entries.get(path);
|
||||||
|
if (entry instanceof ContentItem)
|
||||||
|
{
|
||||||
|
- logger.warn("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
+ logger.warning("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final ZipContentLocation location;
|
||||||
|
@@ -164,7 +163,7 @@
|
||||||
|
{
|
||||||
|
if (entry instanceof ContentItem)
|
||||||
|
{
|
||||||
|
- logger.warn("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
+ logger.warning("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -188,12 +187,12 @@
|
||||||
|
{
|
||||||
|
if (entry instanceof ContentItem)
|
||||||
|
{
|
||||||
|
- logger.warn("Duplicate Content-Entry encountered: " + path);
|
||||||
|
+ logger.warning("Duplicate Content-Entry encountered: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (entry != null)
|
||||||
|
{
|
||||||
|
- logger.warn("Replacing Directory-Entry with the same name as a Content-Entry: " + path);
|
||||||
|
+ logger.warning("Replacing Directory-Entry with the same name as a Content-Entry: " + path);
|
||||||
|
}
|
||||||
|
final ZipContentItem contentItem = new ZipContentItem(repository, this, zipEntry, data);
|
||||||
|
entries.put(path, contentItem);
|
||||||
|
@@ -352,4 +351,4 @@
|
||||||
|
{
|
||||||
|
return (entries.remove(entity.getName()) != null);
|
||||||
|
}
|
||||||
|
-}
|
||||||
|
\ No newline at end of file
|
||||||
|
+}
|
||||||
|
diff -ru librepository-1.1.3.orig/source/org/pentaho/reporting/libraries/repository/zipreader/ZipReadContentLocation.java librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/zipreader/ZipReadContentLocation.java
|
||||||
|
--- librepository-1.1.3.orig/source/org/pentaho/reporting/libraries/repository/zipreader/ZipReadContentLocation.java 2021-04-07 11:16:05.365984446 +0100
|
||||||
|
+++ librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/zipreader/ZipReadContentLocation.java 2021-04-07 11:17:22.342935587 +0100
|
||||||
|
@@ -21,8 +21,7 @@
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.zip.ZipEntry;
|
||||||
|
|
||||||
|
-import org.apache.commons.logging.Log;
|
||||||
|
-import org.apache.commons.logging.LogFactory;
|
||||||
|
+import java.util.logging.Logger;
|
||||||
|
import org.pentaho.reporting.libraries.repository.ContentCreationException;
|
||||||
|
import org.pentaho.reporting.libraries.repository.ContentEntity;
|
||||||
|
import org.pentaho.reporting.libraries.repository.ContentIOException;
|
||||||
|
@@ -39,7 +38,7 @@
|
||||||
|
*/
|
||||||
|
public class ZipReadContentLocation implements ContentLocation
|
||||||
|
{
|
||||||
|
- private static final Log logger = LogFactory.getLog(ZipReadContentLocation.class);
|
||||||
|
+ private static final Logger logger = Logger.getLogger(ZipReadContentLocation.class.getName());
|
||||||
|
private ZipReadRepository repository;
|
||||||
|
private ZipReadContentLocation parent;
|
||||||
|
private String comment;
|
||||||
|
@@ -117,7 +116,7 @@
|
||||||
|
final Object entry = entries.get(path);
|
||||||
|
if (entry instanceof ContentItem)
|
||||||
|
{
|
||||||
|
- logger.warn("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
+ logger.warning("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final ZipReadContentLocation location;
|
||||||
|
@@ -164,7 +163,7 @@
|
||||||
|
{
|
||||||
|
if (entry instanceof ContentItem)
|
||||||
|
{
|
||||||
|
- logger.warn("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
+ logger.warning("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -188,12 +187,12 @@
|
||||||
|
{
|
||||||
|
if (entry instanceof ContentItem)
|
||||||
|
{
|
||||||
|
- logger.warn("Duplicate Content-Entry encountered: " + path);
|
||||||
|
+ logger.warning("Duplicate Content-Entry encountered: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (entry != null)
|
||||||
|
{
|
||||||
|
- logger.warn("Replacing Directory-Entry with the same name as a Content-Entry: " + path);
|
||||||
|
+ logger.warning("Replacing Directory-Entry with the same name as a Content-Entry: " + path);
|
||||||
|
}
|
||||||
|
final ZipReadContentItem contentItem = new ZipReadContentItem(repository, this, zipEntry, data);
|
||||||
|
entries.put(path, contentItem);
|
||||||
@ -1,102 +1,56 @@
|
|||||||
%define with_gcj 1
|
|
||||||
%define javahome %{_jvmdir}/jdk
|
|
||||||
|
|
||||||
Name: java-jfree-librepository
|
Name: java-jfree-librepository
|
||||||
Version: 1.1.3
|
Version: 1.1.3
|
||||||
Release: 1mamba
|
Release: 2mamba
|
||||||
Summary: a simple abstraction layer to access bulk content that is organized in a hierarchical layer
|
Summary: a simple abstraction layer to access bulk content that is organized in a hierarchical layer
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
Distribution: openmamba
|
Distribution: openmamba
|
||||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||||
URL: http://reporting.pentaho.org/
|
URL: https://community.hitachivantara.com/home
|
||||||
# http://sourceforge.net/projects/jfreereport/
|
Source0: http://sourceforge.net/projects/jfreereport/files/02.%20Libraries/%{version}-stable/librepository-%{version}.zip
|
||||||
# cvs -d:pserver:anonymous@jfreereport.cvs.sourceforge.net:/cvsroot/jfreereport login
|
Patch0: java-jfree-librepository-1.1.3-build.patch
|
||||||
# cvs -z3 -d:pserver:anonymous@jfreereport.cvs.sourceforge.net:/cvsroot/jfreereport co -P librepository
|
Patch1: java-jfree-librepository-1.1.3-java11.patch
|
||||||
Source0: http://sourceforge.net/projects/jfreereport/files/02.%20Libraries/1.1.3-stable/librepository-1.1.3.zip
|
Patch2: java-jfree-librepository-1.1.3-remove-ant-contrib-support.patch
|
||||||
Patch0: java-jfree-librepository-1.1.3-build_properties.patch
|
Patch3: java-jfree-librepository-1.1.3-remove-commons-logging.patch
|
||||||
License: LGPL
|
License: LGPL
|
||||||
BuildRequires: ant-contribb3
|
## AUTOBUILDREQ-BEGIN
|
||||||
|
## AUTOBUILDREQ-END
|
||||||
|
BuildRequires: javapackages
|
||||||
BuildRequires: apache-ant
|
BuildRequires: apache-ant
|
||||||
BuildRequires: jakarta-commons-logging
|
|
||||||
BuildRequires: java-glassfish-jaf
|
|
||||||
BuildRequires: java-glassfish-javamail
|
|
||||||
BuildRequires: java-jfree-libbase
|
|
||||||
BuildRequires: java-junit3
|
|
||||||
BuildRequires: jpackage-utils
|
|
||||||
Requires: java-jfree-libbase
|
Requires: java-jfree-libbase
|
||||||
Requires: jpackage-utils
|
Requires: javapackages
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
LibRepository provides a simple abstraction layer to access bulk content that is organized in a hierarchical layer.
|
LibRepository provides a simple abstraction layer to access bulk content that is organized in a hierarchical layer.
|
||||||
|
|
||||||
Unlike the JSR-000170, this library does not aim to solve all problems associated with content storages. The main purpose of LibRepository is to give users an astract view over an filesystem like structure so that content generator and content consumer do no longer have to make assumptions about where to store the generated content.
|
Unlike the JSR-000170, this library does not aim to solve all problems associated with content storages. The main purpose of LibRepository is to give users an astract view over an filesystem like structure so that content generator and content consumer do no longer have to make assumptions about where to store the generated content.
|
||||||
|
|
||||||
The repositories described here should not be used to store other things than BLOBs.
|
The repositories described here should not be used to store other things than BLOBs.
|
||||||
|
|
||||||
%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
|
|
||||||
JFree Base Services.
|
|
||||||
|
|
||||||
This package contains GCJ support for %{name}.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%package javadoc
|
%package javadoc
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
Summary: Javadoc for %{name}
|
Summary: Javadoc for %{name}
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
LibRepository provides a simple abstraction layer to access bulk content that is organized in a hierarchical layer.
|
LibRepository provides a simple abstraction layer to access bulk content that is organized in a hierarchical layer.
|
||||||
|
|
||||||
This package contains documentation for %{name}.
|
This package contains documentation for %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
|
%setup -q -c
|
||||||
|
%patch0 -p1 -b .build
|
||||||
|
%patch1 -p1 -b .java11
|
||||||
|
%patch2 -p1 -b .remove-ant-contrib-support
|
||||||
|
%patch3 -p1 -b .remove-commons-logging
|
||||||
|
|
||||||
%setup -q -c -n librepository
|
find . -name "*.jar" -exec rm -f {} \;
|
||||||
%patch0
|
mkdir -p lib
|
||||||
|
build-jar-repository -s -p lib libbase
|
||||||
for j in $(find . -name "*.jar"); do
|
|
||||||
rm -rf $j
|
|
||||||
done
|
|
||||||
|
|
||||||
for txt in ChangeLog.txt licence-LGPL.txt README.txt; do
|
|
||||||
%{__perl} -pi -e 's/\r$//g' $txt
|
|
||||||
done
|
|
||||||
|
|
||||||
mkdir -p lib/ant-contrib
|
|
||||||
ln -sf $(build-classpath libbase) lib/libbase-%{version}.jar
|
|
||||||
ln -sf $(build-classpath commons-logging-api) lib/commons-logging-api-1.0.4.jar
|
|
||||||
ln -sf $(build-classpath junit-3.8.2) lib/junit.jar
|
|
||||||
ln -sf $(build-classpath glassfish-jaf) lib/activation-1.1.1.jar
|
|
||||||
ln -sf $(build-classpath glassfish-javamail-monolithic) lib/mail-1.4.1.jar
|
|
||||||
ln -s %{_javadir}/ant/* lib/ant-contrib
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
ant jar javadoc
|
||||||
unset JAVA_HOME
|
|
||||||
export JAVA_HOME=%{javahome}
|
|
||||||
export CLASSPATH=$(build-classpath ant-contribb3 commons-logging-api libbase junit-3.8.2 glassfish-jaf glassfish-javamail)
|
|
||||||
ant \
|
|
||||||
jar javadoc
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_javadir}
|
mkdir -p %{buildroot}%{_javadir}
|
||||||
|
|
||||||
install -pm 644 dist/librepository-%{version}.jar %{buildroot}%{_javadir}/librepository-%{version}.jar
|
install -pm 644 dist/librepository-%{version}.jar %{buildroot}%{_javadir}/librepository-%{version}.jar
|
||||||
|
|
||||||
(
|
(
|
||||||
@ -109,10 +63,6 @@ install -pm 644 dist/librepository-%{version}.jar %{buildroot}%{_javadir}/librep
|
|||||||
mkdir -p %{buildroot}%{_javadocdir}/librepository
|
mkdir -p %{buildroot}%{_javadocdir}/librepository
|
||||||
cp -pr bin/javadoc/docs/api/* %{buildroot}%{_javadocdir}/librepository
|
cp -pr bin/javadoc/docs/api/* %{buildroot}%{_javadocdir}/librepository
|
||||||
|
|
||||||
%if %with_gcj
|
|
||||||
%{_bindir}/aot-compile-rpm
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
|
|
||||||
@ -120,30 +70,16 @@ cp -pr bin/javadoc/docs/api/* %{buildroot}%{_javadocdir}/librepository
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_javadir}/librepository-%{version}.jar
|
%{_javadir}/librepository-%{version}.jar
|
||||||
%{_javadir}/librepository.jar
|
%{_javadir}/librepository.jar
|
||||||
%doc ChangeLog.txt licence-LGPL.txt README.txt
|
%doc licence-LGPL.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-librepository/librepository-%{version}.jar.db
|
|
||||||
%{_libdir}/gcj/java-jfree-librepository/librepository-%{version}.jar.so
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_javadocdir}/librepository
|
%{_javadocdir}/librepository
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 10 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.3-2mamba
|
||||||
|
- rebuilt without gcj and with java 11
|
||||||
|
|
||||||
* Sat Jan 22 2011 gil <puntogil@libero.it> 1.1.3-1mamba
|
* Sat Jan 22 2011 gil <puntogil@libero.it> 1.1.3-1mamba
|
||||||
- update to 1.1.3
|
- update to 1.1.3
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user