Alon Bar-Lev has uploaded a new change for review. Change subject: Respect ANT_OPTS and java.io.tmpdir ......................................................................
Respect ANT_OPTS and java.io.tmpdir Change-Id: I6d1345f9a3dbca434b4159adf1c7483b6cba02e4 Signed-off-by: Alon Bar-Lev <[email protected]> --- A jasperreports-server-5.5.0-ANT_OPTS.patch A jasperreports-server-5.5.0-java.io.tmpdir.patch M jasperreports-server.spec 3 files changed, 69 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/jasperreports-server-rpm refs/changes/13/24113/1 diff --git a/jasperreports-server-5.5.0-ANT_OPTS.patch b/jasperreports-server-5.5.0-ANT_OPTS.patch new file mode 100644 index 0000000..bcb41a3 --- /dev/null +++ b/jasperreports-server-5.5.0-ANT_OPTS.patch @@ -0,0 +1,27 @@ +From 9e95c8ebb8dd0445d203412c09fc022b470afad9 Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev <[email protected]> +Date: Wed, 5 Feb 2014 13:59:28 +0200 +Subject: [PATCH 1/2] buildomatic: do not overwrite ANT_OPT + +enable passing misc options to java/ant. + +Signed-off-by: Alon Bar-Lev <[email protected]> +--- + buildomatic/js-ant | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jasperreports-server-cp-5.5.0-bin/buildomatic/js-ant b/jasperreports-server-cp-5.5.0-bin/buildomatic/js-ant +index d616774..5775cb9 100755 +--- a/jasperreports-server-cp-5.5.0-bin/buildomatic/js-ant ++++ b/jasperreports-server-cp-5.5.0-bin/buildomatic/js-ant +@@ -1,6 +1,6 @@ + #!/bin/sh + +-ANT_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=512m" ++ANT_OPTS="${ANT_OPTS} -Xms128m -Xmx512m -XX:MaxPermSize=512m" + + # + # setup to use bundled of ant +-- +1.8.3.2 + diff --git a/jasperreports-server-5.5.0-java.io.tmpdir.patch b/jasperreports-server-5.5.0-java.io.tmpdir.patch new file mode 100644 index 0000000..f10fd45 --- /dev/null +++ b/jasperreports-server-5.5.0-java.io.tmpdir.patch @@ -0,0 +1,33 @@ +From 67d395c459cd69c2f03a9550c1baf63d6ae1524a Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev <[email protected]> +Date: Wed, 5 Feb 2014 14:04:59 +0200 +Subject: [PATCH 2/2] buildomatic: delegate java.io.tmpdir to import/export + +jasper uses TMPDIR/jasperserver/ TMPDIR/dataSnapshots for cache. + +if run by different users we end up with permission conflict. + +setting java.io.tmpdir should effect the build to allow to alter cache +location. + +Signed-off-by: Alon Bar-Lev <[email protected]> +--- + buildomatic/bin/import-export.xml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/jasperreports-server-cp-5.5.0-bin/buildomatic/bin/import-export.xml b/jasperreports-server-cp-5.5.0-bin/buildomatic/bin/import-export.xml +index bd2157f..45afda5 100755 +--- a/jasperreports-server-cp-5.5.0-bin/buildomatic/bin/import-export.xml ++++ b/jasperreports-server-cp-5.5.0-bin/buildomatic/bin/import-export.xml +@@ -159,6 +159,8 @@ Make sure you have compiled the jasperserver source code. + <arg value="--@{type}"/> + <arg value="${archiveArg}"/> + <args/> ++ <!-- delegate tmpdir as jasper uses hardcoded path for cache --> ++ <jvmarg value="-Djava.io.tmpdir=${java.io.tmpdir}"/> + <!-- add arg that tells oracle JDBC driver to use utf-8 types; won't hurt anyone else --> + <jvmarg value="-Doracle.jdbc.defaultNChar=true"/> + <!-- add this to handle properly import catalogs with utf-8 names --> +-- +1.8.3.2 + diff --git a/jasperreports-server.spec b/jasperreports-server.spec index 63e0921..5f1a424 100644 --- a/jasperreports-server.spec +++ b/jasperreports-server.spec @@ -2,7 +2,7 @@ Name: jasperreports-server Version: 5.5.0 -Release: 5%{?dist} +Release: 6%{?dist} License: AGPLv3 Summary: JasperReports Server URL: http://community.jaspersoft.com @@ -11,6 +11,8 @@ Patch0: %{name}-%{version}-additional-config.patch Patch1: %{name}-%{version}-install_resources.patch Patch2: %{name}-%{version}-write-own.patch +Patch3: %{name}-%{version}-ANT_OPTS.patch +Patch4: %{name}-%{version}-java.io.tmpdir.patch AutoReqProv: no BuildRequires: java-1.7.0-openjdk-devel @@ -29,6 +31,8 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build @@ -41,6 +45,10 @@ %{_datadir}/%{name} %changelog +* Wed Feb 5 2014 Alon Bar-Lev <[email protected]> - 5.5.0-6 +- Make jasper respect ANT_OPTS. +- Make jasper delegate java.io.tmpdir to sub processes. + * Tue Jan 28 2014 Alon Bar-Lev <[email protected]> - 5.5.0-5 - Prevent jasper build to modify files at /usr. -- To view, visit http://gerrit.ovirt.org/24113 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d1345f9a3dbca434b4159adf1c7483b6cba02e4 Gerrit-PatchSet: 1 Gerrit-Project: jasperreports-server-rpm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
