Toshaan Bharvani
6 months ago
commit
095f1a55f1
6 changed files with 653 additions and 0 deletions
@ -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> |
@ -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.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" |
||||||
|
@@ -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. |
Binary file not shown.
@ -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" /> |
@ -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); |
@ -0,0 +1,177 @@ |
|||||||
|
Name: librepository |
||||||
|
Version: 1.1.3 |
||||||
|
Release: 31%{?dist} |
||||||
|
Summary: Hierarchical repository abstraction layer |
||||||
|
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, libbase >= 1.1.3 |
||||||
|
Requires: java-headless, jpackage-utils, libbase >= 1.1.3 |
||||||
|
BuildArch: noarch |
||||||
|
Patch0: librepository-1.1.2.build.patch |
||||||
|
Patch1: librepository-1.1.2.java11.patch |
||||||
|
Patch2: librepository-1.1.3-remove-ant-contrib-support.patch |
||||||
|
Patch3: librepository-1.1.3-remove-commons-logging.patch |
||||||
|
|
||||||
|
%description |
||||||
|
LibRepository provides a simple abstraction layer to access bulk content that |
||||||
|
is organized in a hierarchical layer. |
||||||
|
|
||||||
|
%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 {} \; |
||||||
|
mkdir -p lib |
||||||
|
build-jar-repository -s -p lib libbase |
||||||
|
|
||||||
|
%build |
||||||
|
ant jar javadoc |
||||||
|
for file in README.txt licence-LGPL.txt ChangeLog.txt; do |
||||||
|
tr -d '\r' < $file > $file.new |
||||||
|
mv $file.new $file |
||||||
|
done |
||||||
|
|
||||||
|
%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 licence-LGPL.txt README.txt ChangeLog.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 |
||||||
|
- Related: rhbz#1951282 replace apache-commons-logging with java.util.logging |
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-29 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild |
||||||
|
|
||||||
|
* Fri Jan 15 2021 Nicolas Lécureuil <neoclust@mageia.org> - 1.1.3-28 |
||||||
|
- Remove ant-contrib support |
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-27 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild |
||||||
|
|
||||||
|
* Fri Jul 17 2020 Caolán McNamara <caolanm@redhat.com> - 1.1.3-26 |
||||||
|
- Resolves: rhbz#1858037 disable failing javadoc parts |
||||||
|
|
||||||
|
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.1.3-25 |
||||||
|
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 |
||||||
|
|
||||||
|
* Wed Jun 10 2020 Caolán McNamara <caolanm@redhat.com> - 1.1.3-24 |
||||||
|
- allow rebuild with java 11 |
||||||
|
|
||||||
|
* Tue May 05 2020 Caolán McNamara <caolanm@redhat.com> - 1.1.3-23 |
||||||
|
- allow rebuild with java 11 |
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-22 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild |
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-21 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild |
||||||
|
|
||||||
|
* Fri Apr 05 2019 Stephan Bergmann <sbergman@redhat.com> - 1.1.3-20 |
||||||
|
- Use /usr/share/java instead of _javadir macro for build dependencies |
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-19 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild |
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-18 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild |
||||||
|
|
||||||
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-17 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild |
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-16 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild |
||||||
|
|
||||||
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-15 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild |
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-14 |
||||||
|
- 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-13 |
||||||
|
- 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-12 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild |
||||||
|
|
||||||
|
* Tue Feb 25 2014 Caolán McNamara <caolanm@redhat.com> - 1.1.3-11 |
||||||
|
- Resolves: rhbz#1068365 Switch to java-headless (build)requires |
||||||
|
|
||||||
|
* Wed Oct 23 2013 Caolán McNamara <caolanm@redhat.com> - 1.1.3-10 |
||||||
|
- Resolves: rhbz#1022137 remove versioned jars |
||||||
|
|
||||||
|
* Tue Aug 06 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.1.3-9 |
||||||
|
- 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-8 |
||||||
|
- 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-7 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild |
||||||
|
|
||||||
|
* Sat Nov 03 2012 Caolán McNamara <caolanm@redhat.com> - 1.1.3-6 |
||||||
|
- repack source to remove bundled multi-license .jars |
||||||
|
|
||||||
|
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-5 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild |
||||||
|
|
||||||
|
* 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 |
||||||
|
|
||||||
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild |
||||||
|
|
||||||
|
* Wed Dec 02 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-2.OOo31 |
||||||
|
- make javadoc no-arch when building as arch-dependant aot |
||||||
|
|
||||||
|
* Mon Mar 16 2009 Caolan McNamara <caolanm@redhat.com> 1.0.0-1.OOo31 |
||||||
|
- Post-release tuned for OpenOffice.org |
||||||
|
|
||||||
|
* Mon Mar 09 2009 Caolan McNamara <caolanm@redhat.com> 0.2.0-1 |
||||||
|
- latest version |
||||||
|
|
||||||
|
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.6-2 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild |
||||||
|
|
||||||
|
* Wed May 07 2008 Caolan McNamara <caolanm@redhat.com> 0.1.6-1 |
||||||
|
- initial fedora import |
Loading…
Reference in new issue