details: /erp/devel/int/rev/174274efc18c
changeset: 7134:174274efc18c
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 23 13:51:11 2010 +0200
summary: fixed bug 12683: Oracle build takes a lot of time
details: /erp/devel/int/rev/8dc35f2ddcca
changeset: 7135:8dc35f2ddcca
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Fri Apr 23 17:46:46 2010 +0530
summary: Fixes Issue 12743: bracket and format issue has been fixed
diffstat:
build.xml | 9 +-
config/Openbravo.properties.template | 4 +
src-wad/build.xml | 4 +-
src/build.xml | 10 +
src/buildAD.xml | 3 +-
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html | 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java | 57
+++++----
7 files changed, 57 insertions(+), 32 deletions(-)
diffs (255 lines):
diff -r 89f2a74f50fd -r 8dc35f2ddcca build.xml
--- a/build.xml Fri Apr 23 13:40:09 2010 +0200
+++ b/build.xml Fri Apr 23 17:46:46 2010 +0530
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2009 Openbravo SLU
+* All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -187,6 +187,12 @@
<equals arg1="${bbdd.rdbms}" arg2="POSTGRE" />
</and>
</condition>
+
+ <condition property="java.security.egd" value="">
+ <not>
+ <isset property="${java.security.egd}" />
+ </not>
+ </condition>
<path id="project.class.path">
<pathelement path="${build}" />
@@ -663,6 +669,7 @@
<java classname="org.openbravo.erpCommon.modules.ApplyModuleTask"
fork="true" maxmemory="${build.maxmemory}" failonerror="true">
<arg line="'${base.src}'" />
<classpath refid="project.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
</target>
diff -r 89f2a74f50fd -r 8dc35f2ddcca config/Openbravo.properties.template
--- a/config/Openbravo.properties.template Fri Apr 23 13:40:09 2010 +0200
+++ b/config/Openbravo.properties.template Fri Apr 23 17:46:46 2010 +0530
@@ -66,6 +66,10 @@
# bbdd.password=TAD
# bbdd.sessionConfig=ALTER SESSION SET NLS_DATE_FORMAT='DD-MM-YYYY'
NLS_NUMERIC_CHARACTERS='.,'
+# Oracle instances in linux, can delay on getting DB connection (issue
#12683).
+# In these cases this property can be set to solve the problem
+# java.security.egd=file:///dev/urandom
+
bbdd.rdbms=POSTGRE
bbdd.driver=org.postgresql.Driver
bbdd.url=jdbc:postgresql://localhost:5432
diff -r 89f2a74f50fd -r 8dc35f2ddcca src-wad/build.xml
--- a/src-wad/build.xml Fri Apr 23 13:40:09 2010 +0200
+++ b/src-wad/build.xml Fri Apr 23 17:46:46 2010 +0530
@@ -13,7 +13,7 @@
* and limitations under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2005-2009 Openbravo SLU
+ * All portions are Copyright (C) 2005-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): Openbravo S.L.U.
************************************************************************
@@ -61,11 +61,13 @@
<java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java"
fork="yes" maxmemory="${build.maxmemory}">
<arg line="'${base.config}'/Openbravo.properties .xsql ./src/org
'${build.wad.sqlc}'" />
<classpath refid="wad.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
<java classname="org.openbravo.data.Sqlc"
jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
<arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}'
'${build.wad.sqlc}'/src */src-wad" />
<classpath refid="wad.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
</target>
diff -r 89f2a74f50fd -r 8dc35f2ddcca src/build.xml
--- a/src/build.xml Fri Apr 23 13:40:09 2010 +0200
+++ b/src/build.xml Fri Apr 23 17:46:46 2010 +0530
@@ -132,6 +132,7 @@
<java classname="org.openbravo.translate.Translate"
jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
<arg line="clean '${base.config}/Openbravo.properties'" />
<classpath refid="project.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
</target>
@@ -139,6 +140,7 @@
<java classname="org.openbravo.translate.Translate"
jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
<arg line="remove '${base.config}/Openbravo.properties'" />
<classpath refid="project.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
</target>
@@ -163,11 +165,13 @@
<java classname="org.openbravo.data.Sqlc" fork="yes"
jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}"
failonerror="true">
<arg line="'${base.config}'/Openbravo.properties .xsql .
'${build.sqlc}'/src" />
<classpath refid="project.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
<java classname="org.openbravo.data.Sqlc" fork="yes"
jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}"
failonerror="true">
<arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}'
'${build.sqlc}'/src */src" />
<jvmarg value="-Dsqlc.queryExecutionStrategy=traditional"/>
<classpath refid="project.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
<copy file="${base.src}/buildAD.xml" tofile="${build.AD}/build.xml" />
<copy file="${base.src}/log4j.lcf" tofile="${build.AD}/log4j.lcf" />
@@ -252,6 +256,7 @@
<workflow debug="false" srcGenPath="${base.src.gen}"
propertiesFile="${base.config}/Openbravo.properties"
file="${base.src}/org/openbravo/base/gen/gen_entity.oaw" fork="true"
maxmemory="${build.maxmemory}">
<param name="ob.properties.location"
value="${base.config}/Openbravo.properties" />
<param name="base.src.gen" value="${base.src.gen}" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
<classpath>
<path refid="project.class.path" />
</classpath>
@@ -401,6 +406,7 @@
<java classname="org.openbravo.wad.Wad" jvm="${env.JAVA_HOME}/bin/java"
fork="yes" maxmemory="${build.maxmemory}" failonerror="true">
<arg line="'${base.config}' '${tab}'
'${build.AD}/org/openbravo/erpWindows' '${build.AD}/org/openbravo/erpCommon'
'${build.sqlc}/src' '${webTab}'
'${build.AD}/org/openbravo/erpCommon/ad_actionButton' '${base.design}'
'${base.translate.structure}' '${client.web.xml}' '..' '${attach.path}'
'${web.url}' '${base.src}' '${complete}' '${module}' 'noquick'" />
<classpath refid="project.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
<antcall target="postwad" inheritall="true" inheritrefs="true" />
</target>
@@ -410,6 +416,7 @@
<java classname="org.openbravo.wad.Wad" jvm="${env.JAVA_HOME}/bin/java"
fork="yes" maxmemory="${build.maxmemory}">
<arg line="'${base.config}' '${tab}'
'${build.AD}/org/openbravo/erpWindows' '${build.AD}/org/openbravo/erpCommon'
'${build.sqlc}/src' '${webTab}'
'${build.AD}/org/openbravo/erpCommon/ad_actionButton' '${base.design}'
'${base.translate.structure}' '${client.web.xml}' '..' '${attach.path}'
'${web.url}' '${base.src}' '${complete}' '${module}' 'quick'" />
<classpath refid="project.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
<antcall target="postwad" inheritall="true" inheritrefs="true" />
</target>
@@ -476,6 +483,7 @@
<java classname="org.openbravo.data.Sqlc" fork="yes"
jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}"
failonerror="true">
<arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}'
'${build.sqlc}'/src */src" />
<classpath refid="project.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
</target>
@@ -744,6 +752,7 @@
<java classname="org.openbravo.translate.Translate"
jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
<arg line="'${base.config}/Openbravo.properties' ${extension}
'${base.modules}' '*/src'" />
<classpath refid="project.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
</target>
@@ -769,6 +778,7 @@
<java classname="org.openbravo.translate.Translate"
jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
<arg line="'${base.config}/Openbravo.properties' ${extension}
'${basedir}'" />
<classpath refid="project.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
</target>
diff -r 89f2a74f50fd -r 8dc35f2ddcca src/buildAD.xml
--- a/src/buildAD.xml Fri Apr 23 13:40:09 2010 +0200
+++ b/src/buildAD.xml Fri Apr 23 17:46:46 2010 +0530
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2008 Openbravo SLU
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -27,6 +27,7 @@
<arg line="'${base.config}'/Openbravo.properties .xsql ../srcAD
'${build.sqlc}'/src" />
<jvmarg value="-Dsqlc.queryExecutionStrategy=traditional"/>
<classpath refid="project.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
</target>
diff -r 89f2a74f50fd -r 8dc35f2ddcca
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html
Fri Apr 23 13:40:09 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html
Fri Apr 23 17:46:46 2010 +0530
@@ -260,7 +260,7 @@
<tr>
<td class="TitleCell"><span
class="LabelText">Organization</span></td>
<td class="Combo_ContentCell">
- <select name="inpOrg" id="inpOrg" class="Combo
Combo_OneCell_width" required="false">
+ <select name="inpOrg" id="inpOrg" class="Combo
Combo_TwoCells_width" required="false">
<option value=""> <div id="reportAD_ORGID"></div></option>
</select></td>
<td class="ContentCell"></td>
diff -r 89f2a74f50fd -r 8dc35f2ddcca
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java
Fri Apr 23 13:40:09 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java
Fri Apr 23 17:46:46 2010 +0530
@@ -301,36 +301,37 @@
advisePopUp(request, response, "WARNING", Utility.messageBD(this,
"NoDataFound", vars
.getLanguage()));
}
-
- String sClientID = vars.getUserClient();
- String sOrganID = "";
- if (strOrg.equals("")) {
- for (int i = 0; i < data.length; i++) {
- sOrganID = sOrganID + "'" + data[i].orgid;
- if (!(i == data.length - 1)) {
- sOrganID = sOrganID + "',";
- } else {
- sOrganID = sOrganID + "'";
- }
- }
-
- } else {
- sOrganID = "'" + strOrg + "'";
- }
- OrganizationData[] dataOrganization = OrganizationData.select(this,
vars.getLanguage(),
- sClientID, sOrganID);
-
String strOutput = vars.commandIn("PDF") ? "pdf" : "xls";
String strReportName =
"@basedesign@/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.jrxml";
- // put address of organization and employer into same data
- for (int i = 0; i < data.length; i++) {
- if (dataOrganization != null && dataOrganization.length > 0) {
- for (int j = 0; j < dataOrganization.length; j++) {
- if (data[i].orgid.equals(dataOrganization[j].adOrgId)) {
- data[i].mittente = dataOrganization[j].adClientIdr;
- data[i].erogante = dataOrganization[j].adClientIdr;
- data[i].addressorganization = dataOrganization[j].cLocationIdr;
- break;
+ OrganizationData[] dataOrganization = null;
+ // populate organization data if report data is available.
+ if (data != null && data.length > 0) {
+ String sClientID = vars.getUserClient();
+ String sOrganID = "";
+ if (strOrg.equals("")) {
+ for (int i = 0; i < data.length; i++) {
+ sOrganID = sOrganID + "'" + data[i].orgid;
+ if (!(i == data.length - 1)) {
+ sOrganID = sOrganID + "',";
+ } else {
+ sOrganID = sOrganID + "'";
+ }
+ }
+
+ } else {
+ sOrganID = "'" + strOrg + "'";
+ }
+ dataOrganization = OrganizationData.select(this, vars.getLanguage(),
sClientID, sOrganID);
+ // put address of organization and employer into same data
+ for (int i = 0; i < data.length; i++) {
+ if (dataOrganization != null && dataOrganization.length > 0) {
+ for (int j = 0; j < dataOrganization.length; j++) {
+ if (data[i].orgid.equals(dataOrganization[j].adOrgId)) {
+ data[i].mittente = dataOrganization[j].adClientIdr;
+ data[i].erogante = dataOrganization[j].adClientIdr;
+ data[i].addressorganization = dataOrganization[j].cLocationIdr;
+ break;
+ }
}
}
}
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
