Related to bug 12683: Revert changes
authorAsier Lostalé <asier.lostale@openbravo.com>
Mon, 17 May 2010 13:54:40 +0200
changeset 7386 2ccd08241915
parent 7385 34a00fbb9f53
child 7387 5f15b78035a1
Related to bug 12683: Revert changes
Backed out changeset 174274efc18c
build.xml
config/Openbravo.properties.template
src-wad/build.xml
src/build.xml
src/buildAD.xml
--- a/build.xml	Mon May 17 16:45:55 2010 +0530
+++ b/build.xml	Mon May 17 13:54:40 2010 +0200
@@ -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-2010 Openbravo SLU
+* All portions are Copyright (C) 2001-2009 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************
@@ -186,12 +186,6 @@
       <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}" />
@@ -669,7 +663,6 @@
     <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>
   
--- a/config/Openbravo.properties.template	Mon May 17 16:45:55 2010 +0530
+++ b/config/Openbravo.properties.template	Mon May 17 13:54:40 2010 +0200
@@ -66,10 +66,6 @@
 # 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
--- a/src-wad/build.xml	Mon May 17 16:45:55 2010 +0530
+++ b/src-wad/build.xml	Mon May 17 13:54:40 2010 +0200
@@ -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-2010 Openbravo SLU 
+ * All portions are Copyright (C) 2005-2009 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s): Openbravo S.L.U.
  ************************************************************************
@@ -61,13 +61,11 @@
     <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>
 
--- a/src/build.xml	Mon May 17 16:45:55 2010 +0530
+++ b/src/build.xml	Mon May 17 13:54:40 2010 +0200
@@ -132,7 +132,6 @@
     <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>
   
@@ -140,7 +139,6 @@
     <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>
 
@@ -165,13 +163,11 @@
     <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" />
@@ -256,7 +252,6 @@
     <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>
@@ -426,7 +421,6 @@
     <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>
@@ -436,7 +430,6 @@
     <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>
@@ -503,7 +496,6 @@
     <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>
 
@@ -772,7 +764,6 @@
     <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>
 
@@ -798,7 +789,6 @@
     <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>
 
--- a/src/buildAD.xml	Mon May 17 16:45:55 2010 +0530
+++ b/src/buildAD.xml	Mon May 17 13:54:40 2010 +0200
@@ -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-2010 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2008 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -27,7 +27,6 @@
       <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>