[newupgrade] Minor refinements.
authorAntonio Moreno <antonio.moreno@openbravo.com>
Wed, 02 Dec 2009 11:49:42 +0100
changeset 5618 277ab38775ac
parent 5617 e8ba7fe80521
child 5619 87c51a8e76f0
[newupgrade] Minor refinements.
build.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODULE.xml
src/build.xml
src/org/openbravo/erpCommon/ad_process/ApplyModules.java
--- a/build.xml	Wed Dec 02 11:34:46 2009 +0100
+++ b/build.xml	Wed Dec 02 11:49:42 2009 +0100
@@ -201,9 +201,10 @@
      <attribute name="v" default="NOT SET"/>
      <sequential>
        <sql driver="${bbdd.driver}" url="${bbdd.owner.url}" userid="${bbdd.user}" password="${bbdd.password}" onerror="continue" autocommit="true">
-                          <classpath> <fileset dir="${base.lib}"> <include name="**/*.jar"> </include> </fileset> </classpath>
-                          <transaction> UPDATE ad_system_info SET system_status='@{v}' ;
-                            DELETE FROM ad_error_log where system_status=(select system_status from ad_system_info)</transaction>
+         <classpath> <fileset dir="${base.lib}"> <include name="**/*.jar"> </include> </fileset> </classpath>
+         <transaction> UPDATE ad_system_info SET system_status='@{v}' ;
+                       DELETE FROM ad_error_log where system_status=(select system_status from ad_system_info)
+         </transaction>
        </sql>
      </sequential>
   </macrodef>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Dec 02 11:34:46 2009 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Dec 02 11:49:42 2009 +0100
@@ -63626,17 +63626,6 @@
 <!--2413C331A08B4F3F98FC3F9A0F2A636C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2413C331A08B4F3F98FC3F9A0F2A636C--></AD_MESSAGE>
 
-<!--25781C637FE541E7BC1699256415F8EA--><AD_MESSAGE>
-<!--25781C637FE541E7BC1699256415F8EA-->  <AD_MESSAGE_ID><![CDATA[25781C637FE541E7BC1699256415F8EA]]></AD_MESSAGE_ID>
-<!--25781C637FE541E7BC1699256415F8EA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--25781C637FE541E7BC1699256415F8EA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--25781C637FE541E7BC1699256415F8EA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--25781C637FE541E7BC1699256415F8EA-->  <VALUE><![CDATA[InvalidFilePath]]></VALUE>
-<!--25781C637FE541E7BC1699256415F8EA-->  <MSGTEXT><![CDATA[The file path is invalid (might contain '../', for example).]]></MSGTEXT>
-<!--25781C637FE541E7BC1699256415F8EA-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
-<!--25781C637FE541E7BC1699256415F8EA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--25781C637FE541E7BC1699256415F8EA--></AD_MESSAGE>
-
 <!--272961BF12DB4930A0F8EDDADE8827CA--><AD_MESSAGE>
 <!--272961BF12DB4930A0F8EDDADE8827CA-->  <AD_MESSAGE_ID><![CDATA[272961BF12DB4930A0F8EDDADE8827CA]]></AD_MESSAGE_ID>
 <!--272961BF12DB4930A0F8EDDADE8827CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Wed Dec 02 11:34:46 2009 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Wed Dec 02 11:49:42 2009 +0100
@@ -11,7 +11,7 @@
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
 <!--0-->  <TYPE><![CDATA[M]]></TYPE>
-<!--0-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License version 1.0.
+<!--0-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License version 1.0.
 You may obtain a copy of the License at http://www.openbravo.com/legal/license.html or in the legal folder of the Openbravo ERP core distribution.]]></LICENSE>
 <!--0-->  <JAVAPACKAGE><![CDATA[org.openbravo]]></JAVAPACKAGE>
 <!--0-->  <LICENSETYPE><![CDATA[OBPL]]></LICENSETYPE>
--- a/src/build.xml	Wed Dec 02 11:34:46 2009 +0100
+++ b/src/build.xml	Wed Dec 02 11:49:42 2009 +0100
@@ -99,9 +99,10 @@
      <attribute name="v" default="NOT SET"/>
      <sequential>
        <sql driver="${bbdd.driver}" url="${bbdd.owner.url}" userid="${bbdd.user}" password="${bbdd.password}" onerror="continue" autocommit="true">
-                          <classpath> <fileset dir="${base.lib}"> <include name="**/*.jar"> </include> </fileset> </classpath>
-                          <transaction> UPDATE ad_system_info SET system_status='@{v}' ;
-                            DELETE FROM ad_error_log where system_status=(select system_status from ad_system_info)</transaction>
+         <classpath> <fileset dir="${base.lib}"> <include name="**/*.jar"> </include> </fileset> </classpath>
+         <transaction> UPDATE ad_system_info SET system_status='@{v}' ;
+                       DELETE FROM ad_error_log where system_status=(select system_status from ad_system_info)
+         </transaction>
        </sql>
      </sequential>
   </macrodef>
--- a/src/org/openbravo/erpCommon/ad_process/ApplyModules.java	Wed Dec 02 11:34:46 2009 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/ApplyModules.java	Wed Dec 02 11:49:42 2009 +0100
@@ -206,9 +206,6 @@
   /**
    * This method returns an ApplyModulesResponse object, that later is transformed into a JSON
    * object and resend to the rebuild window.
-   * 
-   * @param state
-   * @return
    */
   private ApplyModulesResponse fillResponse(String state) {
     ApplyModulesResponse resp = new ApplyModulesResponse();