details: https://code.openbravo.com/erp/devel/pi/rev/fd15aaac6749
changeset: 18802:fd15aaac6749
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Dec 04 11:08:22 2012 +0100
summary: Fixed issue 22449. Load.logoimages will be forked to mitigate some
problems.
diffstat:
build.xml | 4 ++
src/build.xml | 11 ++++++-
src/org/openbravo/erpCommon/utility/ImageToDatabaseLoader.java | 15 ++++++++++
3 files changed, 28 insertions(+), 2 deletions(-)
diffs (74 lines):
diff -r c85d7947580f -r fd15aaac6749 build.xml
--- a/build.xml Mon Dec 03 12:51:38 2012 +0100
+++ b/build.xml Tue Dec 04 11:08:22 2012 +0100
@@ -1108,6 +1108,10 @@
</target>
+ <target name="load.logoimages.forked">
+ <ant dir="${base.src}" target="load.logoimages.forked" inheritAll="true"
inheritRefs="true" />
+ </target>
+
<target name="load.logoimages">
<ant dir="${base.src}" target="load.logoimages" inheritAll="true"
inheritRefs="true" />
</target>
diff -r c85d7947580f -r fd15aaac6749 src/build.xml
--- a/src/build.xml Mon Dec 03 12:51:38 2012 +0100
+++ b/src/build.xml Tue Dec 04 11:08:22 2012 +0100
@@ -116,8 +116,8 @@
</taskdef>
<validateModules userId="0" adminMode="true"
propertiesFile="${base.config}/Openbravo.properties" type="module"
moduleJavaPackage="${module}"/>
</target>
-
- <target name="load.logoimages">
+
+ <target name="load.logoimages.forked">
<taskdef name="imageloading"
classname="org.openbravo.erpCommon.utility.ImageToDatabaseLoader">
<classpath refid="project.class.path" />
</taskdef>
@@ -126,6 +126,13 @@
propertyNames="yourCompanyLoginImage,yourItServiceLoginImage,yourCompanyMenuImage,yourCompanyBigImage,yourCompanyDocumentImage"/>
</target>
+ <target name="load.logoimages">
+ <java classname="org.openbravo.erpCommon.utility.ImageToDatabaseLoader"
fork="true" maxmemory="${build.maxmemory}" failonerror="true">
+ <arg line="'${base.src}'" />
+ <classpath refid="apply.module.runtime.classpath" />
+ </java>
+ </target>
+
<target name="trl.clean" if="translation">
<java classname="org.openbravo.translate.Translate"
jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
<arg line="clean '${base.config}/Openbravo.properties'" />
diff -r c85d7947580f -r fd15aaac6749
src/org/openbravo/erpCommon/utility/ImageToDatabaseLoader.java
--- a/src/org/openbravo/erpCommon/utility/ImageToDatabaseLoader.java Mon Dec
03 12:51:38 2012 +0100
+++ b/src/org/openbravo/erpCommon/utility/ImageToDatabaseLoader.java Tue Dec
04 11:08:22 2012 +0100
@@ -4,6 +4,8 @@
import java.io.FileInputStream;
import java.io.InputStream;
+import org.openbravo.base.AntExecutor;
+import org.openbravo.base.exception.OBException;
import org.openbravo.base.provider.OBProvider;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
@@ -22,6 +24,19 @@
private String basePath;
private String propertyNames;
+ public static void main(String[] args) {
+ final String srcPath = args[0];
+ final File srcDir = new File(srcPath);
+ final File baseDir = srcDir.getParentFile();
+ try {
+ final AntExecutor antExecutor = new
AntExecutor(baseDir.getAbsolutePath());
+ antExecutor.runTask("load.logoimages.forked");
+ } catch (final Exception e) {
+ e.printStackTrace();
+ throw new OBException(e);
+ }
+ }
+
@Override
public void doExecute() {
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
