details: /erp/stable/2.50/rev/fe388334c287
changeset: 9132:fe388334c287
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jan 14 08:29:57 2011 +0100
summary: fixed issue 15653: Allow disabling Custom Queries
diffstat:
src-db/database/model/tables/AD_HEARTBEAT_LOG.xml | 4 +
src-db/database/model/tables/AD_SYSTEM_INFO.xml | 5 +
src-db/database/model/triggers/AD_MODULE_TRG.xml | 4 +-
src-db/database/sourcedata/AD_COLUMN.xml | 74 +++-
src-db/database/sourcedata/AD_ELEMENT.xml | 15 +
src-db/database/sourcedata/AD_FIELD.xml | 50 ++
src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 139 +++---
src/org/openbravo/erpCommon/utility/SystemInfo.java | 238 +++++-----
8 files changed, 345 insertions(+), 184 deletions(-)
diffs (truncated from 695 to 300 lines):
diff -r b4fbdd3b66a4 -r fe388334c287
src-db/database/model/tables/AD_HEARTBEAT_LOG.xml
--- a/src-db/database/model/tables/AD_HEARTBEAT_LOG.xml Thu Jan 13 18:23:22
2011 +0100
+++ b/src-db/database/model/tables/AD_HEARTBEAT_LOG.xml Fri Jan 14 08:29:57
2011 +0100
@@ -189,6 +189,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="ISCUSTOMQUERYENABLED" primaryKey="false" required="false"
type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="AD_HEARTBEAT_LOG_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r b4fbdd3b66a4 -r fe388334c287
src-db/database/model/tables/AD_SYSTEM_INFO.xml
--- a/src-db/database/model/tables/AD_SYSTEM_INFO.xml Thu Jan 13 18:23:22
2011 +0100
+++ b/src-db/database/model/tables/AD_SYSTEM_INFO.xml Fri Jan 14 08:29:57
2011 +0100
@@ -185,6 +185,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="ISCUSTOMQUERYENABLED" primaryKey="false" required="true"
type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="AD_SYSTEM_INFO_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
@@ -211,6 +215,7 @@
</foreign-key>
<check
name="AD_SYSTEM_INFO_CHANGE_PURPOSE"><![CDATA[CHANGE_INSTANCE_PURPOSE IN ('Y',
'N')]]></check>
<check
name="AD_SYSTEM_INFO_CUSTOMIZATI_CHK"><![CDATA[CUSTOMIZATION_ALLOWED IN ('Y',
'N')]]></check>
+ <check name="AD_SYSTEM_INFO_QRYENABLED"><![CDATA[ISCUSTOMQUERYENABLED IN
('Y', 'N')]]></check>
<check
name="AD_SYSTEM_INFO_SHOW_COMMBRAND"><![CDATA[SHOW_COMMUNITY_BRANDING IN ('Y',
'N')]]></check>
<check name="AD_SYSTEM_INFO_SHOWFORGE"><![CDATA[SHOWFORGELOGO IN ('Y',
'N')]]></check>
<check name="AD_SYSTEMINFO_USAGEAUDITENAB"><![CDATA[ISUSAGEAUDITENABLED
IN ('Y', 'N')]]></check>
diff -r b4fbdd3b66a4 -r fe388334c287
src-db/database/model/triggers/AD_MODULE_TRG.xml
--- a/src-db/database/model/triggers/AD_MODULE_TRG.xml Thu Jan 13 18:23:22
2011 +0100
+++ b/src-db/database/model/triggers/AD_MODULE_TRG.xml Fri Jan 14 08:29:57
2011 +0100
@@ -14,7 +14,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) 2008-2010 Openbravo SLU
+ * All portions are Copyright (C) 2008-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************/
@@ -70,6 +70,8 @@
WHERE AD_Module_ID=:new.AD_Module_ID;
END IF;
END IF;
+
+
END AD_MODULE_TRG
]]></body>
</trigger>
diff -r b4fbdd3b66a4 -r fe388334c287 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Jan 13 18:23:22 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Jan 14 08:29:57 2011 +0100
@@ -309437,7 +309437,7 @@
<!--949DC5303EC3DFA5E040A8C0BD06242B-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--949DC5303EC3DFA5E040A8C0BD06242B-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--949DC5303EC3DFA5E040A8C0BD06242B-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--949DC5303EC3DFA5E040A8C0BD06242B--> <POSITION><![CDATA[47]]></POSITION>
+<!--949DC5303EC3DFA5E040A8C0BD06242B--> <POSITION><![CDATA[46]]></POSITION>
<!--949DC5303EC3DFA5E040A8C0BD06242B-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--949DC5303EC3DFA5E040A8C0BD06242B--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
<!--949DC5303EC3DFA5E040A8C0BD06242B-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -309676,6 +309676,78 @@
<!--983E80EFA97649ECB849DE2AB6D7578A-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--983E80EFA97649ECB849DE2AB6D7578A--></AD_COLUMN>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96--><AD_COLUMN>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<AD_COLUMN_ID><![CDATA[99BD1EE0D6FF3C97E040A8C0BD065C96]]></AD_COLUMN_ID>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96--> <NAME><![CDATA[Enable Custom
Queries]]></NAME>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96--> <DESCRIPTION><![CDATA[Send Custom
Queries to Heartbeat]]></DESCRIPTION>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96--> <HELP><![CDATA[The Custom Queries are
queries that can be sent by the Heartbeat server to be executed on the
Openbravo ERP instance. This queries are used the get more extended information
about the usage of the instance.
+
+By disabling this option standard beats will be sent to HeartBeat server, but
not these Custom Queries.]]></HELP>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<COLUMNNAME><![CDATA[IsCustomQueryEnabled]]></COLUMNNAME>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<AD_TABLE_ID><![CDATA[1005400005]]></AD_TABLE_ID>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96--> <SEQNO><![CDATA[490]]></SEQNO>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<AD_ELEMENT_ID><![CDATA[99BD365BE13C2DB2E040A8C0BD065C94]]></AD_ELEMENT_ID>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96--> <POSITION><![CDATA[47]]></POSITION>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--99BD1EE0D6FF3C97E040A8C0BD065C96--></AD_COLUMN>
+
+<!--99BE200F6F79031FE040A8C0BD06667A--><AD_COLUMN>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<AD_COLUMN_ID><![CDATA[99BE200F6F79031FE040A8C0BD06667A]]></AD_COLUMN_ID>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--99BE200F6F79031FE040A8C0BD06667A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--99BE200F6F79031FE040A8C0BD06667A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--99BE200F6F79031FE040A8C0BD06667A--> <NAME><![CDATA[Enable Custom
Queries]]></NAME>
+<!--99BE200F6F79031FE040A8C0BD06667A--> <DESCRIPTION><![CDATA[Send Custom
Queries to Heartbeat]]></DESCRIPTION>
+<!--99BE200F6F79031FE040A8C0BD06667A--> <HELP><![CDATA[The Custom Queries are
queries that can be sent by the Heartbeat server to be executed on the
Openbravo ERP instance. This queries are used the get more extended information
about the usage of the instance.
+
+By disabling this option standard beats will be sent to HeartBeat server, but
not these Custom Queries.]]></HELP>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<COLUMNNAME><![CDATA[IsCustomQueryEnabled]]></COLUMNNAME>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<AD_TABLE_ID><![CDATA[1005400006]]></AD_TABLE_ID>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--99BE200F6F79031FE040A8C0BD06667A--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--99BE200F6F79031FE040A8C0BD06667A--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--99BE200F6F79031FE040A8C0BD06667A--> <SEQNO><![CDATA[480]]></SEQNO>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<AD_ELEMENT_ID><![CDATA[99BD365BE13C2DB2E040A8C0BD065C94]]></AD_ELEMENT_ID>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--99BE200F6F79031FE040A8C0BD06667A--> <POSITION><![CDATA[48]]></POSITION>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--99BE200F6F79031FE040A8C0BD06667A--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--99BE200F6F79031FE040A8C0BD06667A-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--99BE200F6F79031FE040A8C0BD06667A--></AD_COLUMN>
+
<!--9C003A6D7BC54456B55FD76F9D433E37--><AD_COLUMN>
<!--9C003A6D7BC54456B55FD76F9D433E37-->
<AD_COLUMN_ID><![CDATA[9C003A6D7BC54456B55FD76F9D433E37]]></AD_COLUMN_ID>
<!--9C003A6D7BC54456B55FD76F9D433E37-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r b4fbdd3b66a4 -r fe388334c287 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Thu Jan 13 18:23:22 2011 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Fri Jan 14 08:29:57 2011 +0100
@@ -27420,6 +27420,21 @@
<!--9910D5BD35894A8FBBB365FB9239B711-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--9910D5BD35894A8FBBB365FB9239B711--></AD_ELEMENT>
+<!--99BD365BE13C2DB2E040A8C0BD065C94--><AD_ELEMENT>
+<!--99BD365BE13C2DB2E040A8C0BD065C94-->
<AD_ELEMENT_ID><![CDATA[99BD365BE13C2DB2E040A8C0BD065C94]]></AD_ELEMENT_ID>
+<!--99BD365BE13C2DB2E040A8C0BD065C94-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--99BD365BE13C2DB2E040A8C0BD065C94--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--99BD365BE13C2DB2E040A8C0BD065C94--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--99BD365BE13C2DB2E040A8C0BD065C94-->
<COLUMNNAME><![CDATA[IsCustomQueryEnabled]]></COLUMNNAME>
+<!--99BD365BE13C2DB2E040A8C0BD065C94--> <NAME><![CDATA[Enable Custom
Queries]]></NAME>
+<!--99BD365BE13C2DB2E040A8C0BD065C94--> <PRINTNAME><![CDATA[Enable Custom
Queries]]></PRINTNAME>
+<!--99BD365BE13C2DB2E040A8C0BD065C94--> <DESCRIPTION><![CDATA[Send Custom
Queries to Heartbeat]]></DESCRIPTION>
+<!--99BD365BE13C2DB2E040A8C0BD065C94--> <HELP><![CDATA[The Custom Queries are
queries that can be sent by the Heartbeat server to be executed on the
Openbravo ERP instance. This queries are used the get more extended information
about the usage of the instance.
+
+By disabling this option standard beats will be sent to HeartBeat server, but
not these Custom Queries.]]></HELP>
+<!--99BD365BE13C2DB2E040A8C0BD065C94-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--99BD365BE13C2DB2E040A8C0BD065C94--></AD_ELEMENT>
+
<!--9D15D8B5B341423585BC661594C01822--><AD_ELEMENT>
<!--9D15D8B5B341423585BC661594C01822-->
<AD_ELEMENT_ID><![CDATA[9D15D8B5B341423585BC661594C01822]]></AD_ELEMENT_ID>
<!--9D15D8B5B341423585BC661594C01822-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r b4fbdd3b66a4 -r fe388334c287 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Thu Jan 13 18:23:22 2011 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Jan 14 08:29:57 2011 +0100
@@ -203885,6 +203885,31 @@
<!--98DBCD3E393C408A87F3F6DC53503A30-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--98DBCD3E393C408A87F3F6DC53503A30--></AD_FIELD>
+<!--99BE26C1DD7891CBE040A8C0BD06667C--><AD_FIELD>
+<!--99BE26C1DD7891CBE040A8C0BD06667C-->
<AD_FIELD_ID><![CDATA[99BE26C1DD7891CBE040A8C0BD06667C]]></AD_FIELD_ID>
+<!--99BE26C1DD7891CBE040A8C0BD06667C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--99BE26C1DD7891CBE040A8C0BD06667C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--99BE26C1DD7891CBE040A8C0BD06667C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--99BE26C1DD7891CBE040A8C0BD06667C--> <NAME><![CDATA[Enable Custom
Queries]]></NAME>
+<!--99BE26C1DD7891CBE040A8C0BD06667C--> <DESCRIPTION><![CDATA[Send Custom
Queries to Heartbeat]]></DESCRIPTION>
+<!--99BE26C1DD7891CBE040A8C0BD06667C--> <HELP><![CDATA[The Custom Queries are
queries that can be sent by the Heartbeat server to be executed on the
Openbravo ERP instance. This queries are used the get more extended information
about the usage of the instance.
+
+By disabling this option standard beats will be sent to HeartBeat server, but
not these Custom Queries.]]></HELP>
+<!--99BE26C1DD7891CBE040A8C0BD06667C-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--99BE26C1DD7891CBE040A8C0BD06667C-->
<AD_TAB_ID><![CDATA[1005400006]]></AD_TAB_ID>
+<!--99BE26C1DD7891CBE040A8C0BD06667C-->
<AD_COLUMN_ID><![CDATA[99BE200F6F79031FE040A8C0BD06667A]]></AD_COLUMN_ID>
+<!--99BE26C1DD7891CBE040A8C0BD06667C-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--99BE26C1DD7891CBE040A8C0BD06667C-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--99BE26C1DD7891CBE040A8C0BD06667C--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--99BE26C1DD7891CBE040A8C0BD06667C--> <SEQNO><![CDATA[400]]></SEQNO>
+<!--99BE26C1DD7891CBE040A8C0BD06667C--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--99BE26C1DD7891CBE040A8C0BD06667C-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--99BE26C1DD7891CBE040A8C0BD06667C-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--99BE26C1DD7891CBE040A8C0BD06667C-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--99BE26C1DD7891CBE040A8C0BD06667C-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--99BE26C1DD7891CBE040A8C0BD06667C-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--99BE26C1DD7891CBE040A8C0BD06667C--></AD_FIELD>
+
<!--99DA6E867A144E0C95251C9D0F7BCE77--><AD_FIELD>
<!--99DA6E867A144E0C95251C9D0F7BCE77-->
<AD_FIELD_ID><![CDATA[99DA6E867A144E0C95251C9D0F7BCE77]]></AD_FIELD_ID>
<!--99DA6E867A144E0C95251C9D0F7BCE77-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -206711,4 +206736,29 @@
<!--FF6017DC061144718EB362D7DE06A614-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--FF6017DC061144718EB362D7DE06A614--></AD_FIELD>
+<!--FF8081812D7FD93F012D80127105008E--><AD_FIELD>
+<!--FF8081812D7FD93F012D80127105008E-->
<AD_FIELD_ID><![CDATA[FF8081812D7FD93F012D80127105008E]]></AD_FIELD_ID>
+<!--FF8081812D7FD93F012D80127105008E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081812D7FD93F012D80127105008E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081812D7FD93F012D80127105008E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081812D7FD93F012D80127105008E--> <NAME><![CDATA[Enable Custom
Queries]]></NAME>
+<!--FF8081812D7FD93F012D80127105008E--> <DESCRIPTION><![CDATA[Send Custom
Queries to Heartbeat]]></DESCRIPTION>
+<!--FF8081812D7FD93F012D80127105008E--> <HELP><![CDATA[The Custom Queries are
queries that can be sent by the Heartbeat server to be executed on the
Openbravo ERP instance. This queries are used the get more extended information
about the usage of the instance.
+
+By disabling this option standard beats will be sent to HeartBeat server, but
not these Custom Queries.]]></HELP>
+<!--FF8081812D7FD93F012D80127105008E-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--FF8081812D7FD93F012D80127105008E-->
<AD_TAB_ID><![CDATA[1005400005]]></AD_TAB_ID>
+<!--FF8081812D7FD93F012D80127105008E-->
<AD_COLUMN_ID><![CDATA[99BD1EE0D6FF3C97E040A8C0BD065C96]]></AD_COLUMN_ID>
+<!--FF8081812D7FD93F012D80127105008E-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--FF8081812D7FD93F012D80127105008E-->
<DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--FF8081812D7FD93F012D80127105008E--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--FF8081812D7FD93F012D80127105008E--> <SEQNO><![CDATA[20]]></SEQNO>
+<!--FF8081812D7FD93F012D80127105008E--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--FF8081812D7FD93F012D80127105008E-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--FF8081812D7FD93F012D80127105008E-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FF8081812D7FD93F012D80127105008E-->
<SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--FF8081812D7FD93F012D80127105008E-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--FF8081812D7FD93F012D80127105008E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FF8081812D7FD93F012D80127105008E--></AD_FIELD>
+
</data>
diff -r b4fbdd3b66a4 -r fe388334c287
src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java
--- a/src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java Thu Jan
13 18:23:22 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java Fri Jan
14 08:29:57 2011 +0100
@@ -11,7 +11,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) 2008-2010 Openbravo SLU
+ * All portions are Copyright (C) 2008-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -390,6 +390,8 @@
log.warn("Incorrect number of rejected logins: "
+ SystemInfo.Item.REJECTED_LOGINS_DUE_CONC_USERS.getLabel());
}
+ hbLog.setEnableCustomQueries("Y".equals(systemInfo
+ .getProperty(SystemInfo.Item.CUSTOM_QUERY_ENABLED.getLabel())));
}
OBDal.getInstance().save(hbLog);
} finally {
@@ -402,8 +404,11 @@
*/
private void parseResponse(String response) {
logger.logln(logger.messageDb("HB_UPDATES", ctx.getLanguage()));
- if (response == null)
+ if (response == null) {
return;
+ }
+
+ OBContext.setAdminMode();
try {
JSONObject json = new JSONObject(response);
String beatId = (String) json.get("beatId");
@@ -413,12 +418,15 @@
parseAlerts(alertsResponse);
// Get Custom Queries from JSONObject and process them
- processCustomQueries((JSONArray) json.get("customQueries"), beatId);
-
+ SystemInformation sysInfo =
OBDal.getInstance().get(SystemInformation.class, "0");
+ if (sysInfo != null && sysInfo.isEnableCustomQueries()) {
+ processCustomQueries((JSONArray) json.get("customQueries"), beatId);
+ }
} catch (JSONException e) {
log.error(e.getMessage(), e);
+ } finally {
+ OBContext.restorePreviousMode();
}
-
}
private void parseAlerts(String alertsResponse) {
@@ -501,83 +509,78 @@
if ("null".equals(jsonArrayCQueries.get(0)))
return;
- try {
- OBContext.setAdminMode();
- JSONObject jsonObjectCQReturn = new JSONObject();
- for (int i = 0; i < jsonArrayCQueries.length(); i++) {
- JSONObject jsonCustomQuery = (JSONObject) jsonArrayCQueries.get(i);
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
