[ws-prof] Sending ws info in beats
authorAsier Lostalé <asier.lostale@openbravo.com>
Wed, 14 Dec 2011 11:07:10 +0100
changeset 14919 b60b88aa7a1c
parent 14918 b9453ecf375f
child 14920 c3a23d5d65f0
[ws-prof] Sending ws info in beats
src-db/database/model/tables/AD_HEARTBEAT_LOG.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java
src/org/openbravo/erpCommon/utility/SystemInfo.java
--- a/src-db/database/model/tables/AD_HEARTBEAT_LOG.xml	Wed Dec 14 09:03:54 2011 +0100
+++ b/src-db/database/model/tables/AD_HEARTBEAT_LOG.xml	Wed Dec 14 11:07:10 2011 +0100
@@ -193,10 +193,6 @@
         <default><![CDATA[Y]]></default>
         <onCreateDefault><![CDATA['Y']]></onCreateDefault>
       </column>
-      <column name="WS_CALLS_TOTAL" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
       <column name="WS_CALLS_MAX" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
         <default/>
         <onCreateDefault/>
@@ -205,6 +201,22 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="WSC_CALLS_MAX" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="WSC_CALLS_AVG" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="WS_REJECTED_MAX" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="WS_REJECTED_AVG" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="AD_HEARTBEAT_LOG_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Wed Dec 14 09:03:54 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Wed Dec 14 11:07:10 2011 +0100
@@ -216986,6 +216986,7 @@
 <!--28FCAF6507574F109D7EBA2027E165DF-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--28FCAF6507574F109D7EBA2027E165DF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--28FCAF6507574F109D7EBA2027E165DF-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--28FCAF6507574F109D7EBA2027E165DF-->  <AD_ELEMENT_ID><![CDATA[38148AAF2D384F08B493B5484EFFA6E3]]></AD_ELEMENT_ID>
 <!--28FCAF6507574F109D7EBA2027E165DF-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--28FCAF6507574F109D7EBA2027E165DF-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--28FCAF6507574F109D7EBA2027E165DF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -225420,6 +225421,40 @@
 <!--57923EC680D411DDA0EA574F27229B25-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--57923EC680D411DDA0EA574F27229B25--></AD_COLUMN>
 
+<!--5797D098AFB7437AA54CC596DDC65265--><AD_COLUMN>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <AD_COLUMN_ID><![CDATA[5797D098AFB7437AA54CC596DDC65265]]></AD_COLUMN_ID>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <NAME><![CDATA[Connector Calls Max]]></NAME>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <DESCRIPTION><![CDATA[Maximum number of Connector calls per day in last 30 days]]></DESCRIPTION>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <HELP><![CDATA[Maximum number of Connector calls per day in last 30 days]]></HELP>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <COLUMNNAME><![CDATA[WSC_Calls_Max]]></COLUMNNAME>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <AD_TABLE_ID><![CDATA[1005400006]]></AD_TABLE_ID>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <SEQNO><![CDATA[530]]></SEQNO>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <AD_ELEMENT_ID><![CDATA[D66DAAD6524140849CFCF28CE8FC8290]]></AD_ELEMENT_ID>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <POSITION><![CDATA[53]]></POSITION>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--5797D098AFB7437AA54CC596DDC65265-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--5797D098AFB7437AA54CC596DDC65265--></AD_COLUMN>
+
 <!--579FC427CBEC9889E040007F01013019--><AD_COLUMN>
 <!--579FC427CBEC9889E040007F01013019-->  <AD_COLUMN_ID><![CDATA[579FC427CBEC9889E040007F01013019]]></AD_COLUMN_ID>
 <!--579FC427CBEC9889E040007F01013019-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -241109,6 +241144,40 @@
 <!--753066990E0247129B63D52B5EB343F5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--753066990E0247129B63D52B5EB343F5--></AD_COLUMN>
 
+<!--75383B2897FE493E886439C075F5CE8A--><AD_COLUMN>
+<!--75383B2897FE493E886439C075F5CE8A-->  <AD_COLUMN_ID><![CDATA[75383B2897FE493E886439C075F5CE8A]]></AD_COLUMN_ID>
+<!--75383B2897FE493E886439C075F5CE8A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--75383B2897FE493E886439C075F5CE8A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--75383B2897FE493E886439C075F5CE8A-->  <NAME><![CDATA[WS Rejected Maximum]]></NAME>
+<!--75383B2897FE493E886439C075F5CE8A-->  <DESCRIPTION><![CDATA[Maximum number of Web Service rejected calls per day in last 30 days]]></DESCRIPTION>
+<!--75383B2897FE493E886439C075F5CE8A-->  <HELP><![CDATA[Maximum number of Web Service rejected calls per day in last 30 days]]></HELP>
+<!--75383B2897FE493E886439C075F5CE8A-->  <COLUMNNAME><![CDATA[WS_Rejected_Max]]></COLUMNNAME>
+<!--75383B2897FE493E886439C075F5CE8A-->  <AD_TABLE_ID><![CDATA[1005400006]]></AD_TABLE_ID>
+<!--75383B2897FE493E886439C075F5CE8A-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--75383B2897FE493E886439C075F5CE8A-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--75383B2897FE493E886439C075F5CE8A-->  <SEQNO><![CDATA[550]]></SEQNO>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--75383B2897FE493E886439C075F5CE8A-->  <AD_ELEMENT_ID><![CDATA[4E560259B6C343B0829FF89505742057]]></AD_ELEMENT_ID>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--75383B2897FE493E886439C075F5CE8A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--75383B2897FE493E886439C075F5CE8A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--75383B2897FE493E886439C075F5CE8A-->  <POSITION><![CDATA[55]]></POSITION>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--75383B2897FE493E886439C075F5CE8A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--75383B2897FE493E886439C075F5CE8A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--75383B2897FE493E886439C075F5CE8A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--75383B2897FE493E886439C075F5CE8A--></AD_COLUMN>
+
 <!--7555569CC84A010FE040007F01010B4D--><AD_COLUMN>
 <!--7555569CC84A010FE040007F01010B4D-->  <AD_COLUMN_ID><![CDATA[7555569CC84A010FE040007F01010B4D]]></AD_COLUMN_ID>
 <!--7555569CC84A010FE040007F01010B4D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -256939,6 +257008,7 @@
 <!--858BF5EDF0D34353939952BFFA618F1F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--858BF5EDF0D34353939952BFFA618F1F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--858BF5EDF0D34353939952BFFA618F1F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--858BF5EDF0D34353939952BFFA618F1F-->  <AD_ELEMENT_ID><![CDATA[A10B424632684CE9B54DC67DE1FE5BB9]]></AD_ELEMENT_ID>
 <!--858BF5EDF0D34353939952BFFA618F1F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--858BF5EDF0D34353939952BFFA618F1F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--858BF5EDF0D34353939952BFFA618F1F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -263206,6 +263276,40 @@
 <!--9252E75FDFFB4B91A53007F090FC5F0C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--9252E75FDFFB4B91A53007F090FC5F0C--></AD_COLUMN>
 
+<!--926DB31AD14D4A49BE77D6A3E6105987--><AD_COLUMN>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <AD_COLUMN_ID><![CDATA[926DB31AD14D4A49BE77D6A3E6105987]]></AD_COLUMN_ID>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <NAME><![CDATA[WS Rejected Average]]></NAME>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <DESCRIPTION><![CDATA[Average number of  rejected Web Service calls per day in last 30 days]]></DESCRIPTION>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <HELP><![CDATA[Average number of  rejected Web Service calls per day in last 30 days]]></HELP>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <COLUMNNAME><![CDATA[WS_Rejected_Avg]]></COLUMNNAME>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <AD_TABLE_ID><![CDATA[1005400006]]></AD_TABLE_ID>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <SEQNO><![CDATA[560]]></SEQNO>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <AD_ELEMENT_ID><![CDATA[05C19A393B104A858FCB3E1C3B731617]]></AD_ELEMENT_ID>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <POSITION><![CDATA[56]]></POSITION>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--926DB31AD14D4A49BE77D6A3E6105987-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--926DB31AD14D4A49BE77D6A3E6105987--></AD_COLUMN>
+
 <!--92708DB9C36F42C39034BEAA7BC0F1F3--><AD_COLUMN>
 <!--92708DB9C36F42C39034BEAA7BC0F1F3-->  <AD_COLUMN_ID><![CDATA[92708DB9C36F42C39034BEAA7BC0F1F3]]></AD_COLUMN_ID>
 <!--92708DB9C36F42C39034BEAA7BC0F1F3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -272039,39 +272143,6 @@
 <!--C689CA5725C74EE7AF0E7EBA8DE45EEC-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--C689CA5725C74EE7AF0E7EBA8DE45EEC--></AD_COLUMN>
 
-<!--C78D3A595D5345C6A57F3063E88702F6--><AD_COLUMN>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <AD_COLUMN_ID><![CDATA[C78D3A595D5345C6A57F3063E88702F6]]></AD_COLUMN_ID>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <NAME><![CDATA[WS Calls Total]]></NAME>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <DESCRIPTION><![CDATA[Total number of Web Service calls in last 30 days]]></DESCRIPTION>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <HELP><![CDATA[Total number of Web Service calls in last 30 days]]></HELP>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <COLUMNNAME><![CDATA[WS_Calls_Total]]></COLUMNNAME>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <AD_TABLE_ID><![CDATA[1005400006]]></AD_TABLE_ID>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <SEQNO><![CDATA[490]]></SEQNO>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <POSITION><![CDATA[49]]></POSITION>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--C78D3A595D5345C6A57F3063E88702F6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--C78D3A595D5345C6A57F3063E88702F6--></AD_COLUMN>
-
 <!--C7F200637CD5434F8F138AB7307A790D--><AD_COLUMN>
 <!--C7F200637CD5434F8F138AB7307A790D-->  <AD_COLUMN_ID><![CDATA[C7F200637CD5434F8F138AB7307A790D]]></AD_COLUMN_ID>
 <!--C7F200637CD5434F8F138AB7307A790D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -274270,6 +274341,40 @@
 <!--F298A824BEAB4A2EAC14C68E770940DA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--F298A824BEAB4A2EAC14C68E770940DA--></AD_COLUMN>
 
+<!--F2D8CC6141A94EEA8454C2EAF001130D--><AD_COLUMN>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <AD_COLUMN_ID><![CDATA[F2D8CC6141A94EEA8454C2EAF001130D]]></AD_COLUMN_ID>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <NAME><![CDATA[Connector Calls Average]]></NAME>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <DESCRIPTION><![CDATA[Average number of Connector calls per day in last 30 days]]></DESCRIPTION>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <HELP><![CDATA[Average number of Connector calls per day in last 30 days]]></HELP>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <COLUMNNAME><![CDATA[WSC_Calls_Avg]]></COLUMNNAME>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <AD_TABLE_ID><![CDATA[1005400006]]></AD_TABLE_ID>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <SEQNO><![CDATA[540]]></SEQNO>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <AD_ELEMENT_ID><![CDATA[227C67C05861481E803697C2153404AA]]></AD_ELEMENT_ID>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <POSITION><![CDATA[54]]></POSITION>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--F2D8CC6141A94EEA8454C2EAF001130D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--F2D8CC6141A94EEA8454C2EAF001130D--></AD_COLUMN>
+
 <!--F3790639C5AE4E85B4B4DCADCF35B8CB--><AD_COLUMN>
 <!--F3790639C5AE4E85B4B4DCADCF35B8CB-->  <AD_COLUMN_ID><![CDATA[F3790639C5AE4E85B4B4DCADCF35B8CB]]></AD_COLUMN_ID>
 <!--F3790639C5AE4E85B4B4DCADCF35B8CB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Dec 14 09:03:54 2011 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Dec 14 11:07:10 2011 +0100
@@ -20638,6 +20638,20 @@
 <!--035BE38188FC44538E3DDDA769800CFB-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--035BE38188FC44538E3DDDA769800CFB--></AD_ELEMENT>
 
+<!--05C19A393B104A858FCB3E1C3B731617--><AD_ELEMENT>
+<!--05C19A393B104A858FCB3E1C3B731617-->  <AD_ELEMENT_ID><![CDATA[05C19A393B104A858FCB3E1C3B731617]]></AD_ELEMENT_ID>
+<!--05C19A393B104A858FCB3E1C3B731617-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--05C19A393B104A858FCB3E1C3B731617-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--05C19A393B104A858FCB3E1C3B731617-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--05C19A393B104A858FCB3E1C3B731617-->  <COLUMNNAME><![CDATA[WS_Rejected_Avg]]></COLUMNNAME>
+<!--05C19A393B104A858FCB3E1C3B731617-->  <NAME><![CDATA[WS Rejected Average]]></NAME>
+<!--05C19A393B104A858FCB3E1C3B731617-->  <PRINTNAME><![CDATA[WS Rejected Average]]></PRINTNAME>
+<!--05C19A393B104A858FCB3E1C3B731617-->  <DESCRIPTION><![CDATA[Average number of  rejected Web Service calls per day in last 30 days]]></DESCRIPTION>
+<!--05C19A393B104A858FCB3E1C3B731617-->  <HELP><![CDATA[Average number of  rejected Web Service calls per day in last 30 days]]></HELP>
+<!--05C19A393B104A858FCB3E1C3B731617-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--05C19A393B104A858FCB3E1C3B731617-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--05C19A393B104A858FCB3E1C3B731617--></AD_ELEMENT>
+
 <!--075BF3C1A80D41868E0362185F309415--><AD_ELEMENT>
 <!--075BF3C1A80D41868E0362185F309415-->  <AD_ELEMENT_ID><![CDATA[075BF3C1A80D41868E0362185F309415]]></AD_ELEMENT_ID>
 <!--075BF3C1A80D41868E0362185F309415-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20851,6 +20865,20 @@
 <!--204EED0BC11646F083B7E226CA5E5667-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--204EED0BC11646F083B7E226CA5E5667--></AD_ELEMENT>
 
+<!--227C67C05861481E803697C2153404AA--><AD_ELEMENT>
+<!--227C67C05861481E803697C2153404AA-->  <AD_ELEMENT_ID><![CDATA[227C67C05861481E803697C2153404AA]]></AD_ELEMENT_ID>
+<!--227C67C05861481E803697C2153404AA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--227C67C05861481E803697C2153404AA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--227C67C05861481E803697C2153404AA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--227C67C05861481E803697C2153404AA-->  <COLUMNNAME><![CDATA[WSC_Calls_Avg]]></COLUMNNAME>
+<!--227C67C05861481E803697C2153404AA-->  <NAME><![CDATA[Connector Calls Average]]></NAME>
+<!--227C67C05861481E803697C2153404AA-->  <PRINTNAME><![CDATA[Connector Calls Average]]></PRINTNAME>
+<!--227C67C05861481E803697C2153404AA-->  <DESCRIPTION><![CDATA[Average number of Connector calls per day in last 30 days]]></DESCRIPTION>
+<!--227C67C05861481E803697C2153404AA-->  <HELP><![CDATA[Average number of Connector calls per day in last 30 days]]></HELP>
+<!--227C67C05861481E803697C2153404AA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--227C67C05861481E803697C2153404AA-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--227C67C05861481E803697C2153404AA--></AD_ELEMENT>
+
 <!--22A76EB58F264A7BA616198175C3E4C5--><AD_ELEMENT>
 <!--22A76EB58F264A7BA616198175C3E4C5-->  <AD_ELEMENT_ID><![CDATA[22A76EB58F264A7BA616198175C3E4C5]]></AD_ELEMENT_ID>
 <!--22A76EB58F264A7BA616198175C3E4C5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21022,6 +21050,20 @@
 <!--361ED16139BD40CBA4DB049380EE1641-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--361ED16139BD40CBA4DB049380EE1641--></AD_ELEMENT>
 
+<!--38148AAF2D384F08B493B5484EFFA6E3--><AD_ELEMENT>
+<!--38148AAF2D384F08B493B5484EFFA6E3-->  <AD_ELEMENT_ID><![CDATA[38148AAF2D384F08B493B5484EFFA6E3]]></AD_ELEMENT_ID>
+<!--38148AAF2D384F08B493B5484EFFA6E3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--38148AAF2D384F08B493B5484EFFA6E3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--38148AAF2D384F08B493B5484EFFA6E3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--38148AAF2D384F08B493B5484EFFA6E3-->  <COLUMNNAME><![CDATA[WS_Calls_Avg]]></COLUMNNAME>
+<!--38148AAF2D384F08B493B5484EFFA6E3-->  <NAME><![CDATA[WS Calls Average]]></NAME>
+<!--38148AAF2D384F08B493B5484EFFA6E3-->  <PRINTNAME><![CDATA[WS Calls Average]]></PRINTNAME>
+<!--38148AAF2D384F08B493B5484EFFA6E3-->  <DESCRIPTION><![CDATA[Average number of Web Service calls per day in last 30 days]]></DESCRIPTION>
+<!--38148AAF2D384F08B493B5484EFFA6E3-->  <HELP><![CDATA[Average number of Web Service calls per day in last 30 days]]></HELP>
+<!--38148AAF2D384F08B493B5484EFFA6E3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--38148AAF2D384F08B493B5484EFFA6E3-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--38148AAF2D384F08B493B5484EFFA6E3--></AD_ELEMENT>
+
 <!--39E6CD7BC5154B2783BB43A59C13C9D1--><AD_ELEMENT>
 <!--39E6CD7BC5154B2783BB43A59C13C9D1-->  <AD_ELEMENT_ID><![CDATA[39E6CD7BC5154B2783BB43A59C13C9D1]]></AD_ELEMENT_ID>
 <!--39E6CD7BC5154B2783BB43A59C13C9D1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21442,6 +21484,20 @@
 <!--4AFD554ABDCB488B87F326A3101B50DE-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4AFD554ABDCB488B87F326A3101B50DE--></AD_ELEMENT>
 
+<!--4E560259B6C343B0829FF89505742057--><AD_ELEMENT>
+<!--4E560259B6C343B0829FF89505742057-->  <AD_ELEMENT_ID><![CDATA[4E560259B6C343B0829FF89505742057]]></AD_ELEMENT_ID>
+<!--4E560259B6C343B0829FF89505742057-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4E560259B6C343B0829FF89505742057-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4E560259B6C343B0829FF89505742057-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4E560259B6C343B0829FF89505742057-->  <COLUMNNAME><![CDATA[WS_Rejected_Max]]></COLUMNNAME>
+<!--4E560259B6C343B0829FF89505742057-->  <NAME><![CDATA[WS Rejected Maximum]]></NAME>
+<!--4E560259B6C343B0829FF89505742057-->  <PRINTNAME><![CDATA[WS Rejected Maximum]]></PRINTNAME>
+<!--4E560259B6C343B0829FF89505742057-->  <DESCRIPTION><![CDATA[Maximum number of Web Service rejected calls per day in last 30 days]]></DESCRIPTION>
+<!--4E560259B6C343B0829FF89505742057-->  <HELP><![CDATA[Maximum number of Web Service rejected calls per day in last 30 days]]></HELP>
+<!--4E560259B6C343B0829FF89505742057-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4E560259B6C343B0829FF89505742057-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--4E560259B6C343B0829FF89505742057--></AD_ELEMENT>
+
 <!--4E7F89ADF12B48DBB1B2F965550410DD--><AD_ELEMENT>
 <!--4E7F89ADF12B48DBB1B2F965550410DD-->  <AD_ELEMENT_ID><![CDATA[4E7F89ADF12B48DBB1B2F965550410DD]]></AD_ELEMENT_ID>
 <!--4E7F89ADF12B48DBB1B2F965550410DD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -27069,6 +27125,20 @@
 <!--A0082483F6A94849A1EB41C049E6E0A5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A0082483F6A94849A1EB41C049E6E0A5--></AD_ELEMENT>
 
+<!--A10B424632684CE9B54DC67DE1FE5BB9--><AD_ELEMENT>
+<!--A10B424632684CE9B54DC67DE1FE5BB9-->  <AD_ELEMENT_ID><![CDATA[A10B424632684CE9B54DC67DE1FE5BB9]]></AD_ELEMENT_ID>
+<!--A10B424632684CE9B54DC67DE1FE5BB9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A10B424632684CE9B54DC67DE1FE5BB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A10B424632684CE9B54DC67DE1FE5BB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A10B424632684CE9B54DC67DE1FE5BB9-->  <COLUMNNAME><![CDATA[WS_Calls_Max]]></COLUMNNAME>
+<!--A10B424632684CE9B54DC67DE1FE5BB9-->  <NAME><![CDATA[WS Calls Maximum]]></NAME>
+<!--A10B424632684CE9B54DC67DE1FE5BB9-->  <PRINTNAME><![CDATA[WS Calls Maximum]]></PRINTNAME>
+<!--A10B424632684CE9B54DC67DE1FE5BB9-->  <DESCRIPTION><![CDATA[Maximum number of Web Service calls per day in last 30 days]]></DESCRIPTION>
+<!--A10B424632684CE9B54DC67DE1FE5BB9-->  <HELP><![CDATA[Maximum number of Web Service calls per day in last 30 days]]></HELP>
+<!--A10B424632684CE9B54DC67DE1FE5BB9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A10B424632684CE9B54DC67DE1FE5BB9-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--A10B424632684CE9B54DC67DE1FE5BB9--></AD_ELEMENT>
+
 <!--A39CA291EA03AA9EE040007F010009B3--><AD_ELEMENT>
 <!--A39CA291EA03AA9EE040007F010009B3-->  <AD_ELEMENT_ID><![CDATA[A39CA291EA03AA9EE040007F010009B3]]></AD_ELEMENT_ID>
 <!--A39CA291EA03AA9EE040007F010009B3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -27726,6 +27796,20 @@
 <!--D53F04776DA948AAA14F7CDCB38795D2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D53F04776DA948AAA14F7CDCB38795D2--></AD_ELEMENT>
 
+<!--D66DAAD6524140849CFCF28CE8FC8290--><AD_ELEMENT>
+<!--D66DAAD6524140849CFCF28CE8FC8290-->  <AD_ELEMENT_ID><![CDATA[D66DAAD6524140849CFCF28CE8FC8290]]></AD_ELEMENT_ID>
+<!--D66DAAD6524140849CFCF28CE8FC8290-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D66DAAD6524140849CFCF28CE8FC8290-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D66DAAD6524140849CFCF28CE8FC8290-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D66DAAD6524140849CFCF28CE8FC8290-->  <COLUMNNAME><![CDATA[WSC_Calls_Max]]></COLUMNNAME>
+<!--D66DAAD6524140849CFCF28CE8FC8290-->  <NAME><![CDATA[Connector Calls Max]]></NAME>
+<!--D66DAAD6524140849CFCF28CE8FC8290-->  <PRINTNAME><![CDATA[Connector Calls Max]]></PRINTNAME>
+<!--D66DAAD6524140849CFCF28CE8FC8290-->  <DESCRIPTION><![CDATA[Maximum number of Connector calls per day in last 30 days]]></DESCRIPTION>
+<!--D66DAAD6524140849CFCF28CE8FC8290-->  <HELP><![CDATA[Maximum number of Connector calls per day in last 30 days]]></HELP>
+<!--D66DAAD6524140849CFCF28CE8FC8290-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D66DAAD6524140849CFCF28CE8FC8290-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D66DAAD6524140849CFCF28CE8FC8290--></AD_ELEMENT>
+
 <!--D6B8F4BF589745C2BFC0E41C36E47FDF--><AD_ELEMENT>
 <!--D6B8F4BF589745C2BFC0E41C36E47FDF-->  <AD_ELEMENT_ID><![CDATA[D6B8F4BF589745C2BFC0E41C36E47FDF]]></AD_ELEMENT_ID>
 <!--D6B8F4BF589745C2BFC0E41C36E47FDF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Wed Dec 14 09:03:54 2011 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Wed Dec 14 11:07:10 2011 +0100
@@ -163761,6 +163761,33 @@
 <!--11DCB1BB7D204C46BAA2CCF66A0018EC-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--11DCB1BB7D204C46BAA2CCF66A0018EC--></AD_FIELD>
 
+<!--122B819C6AC34B15B7F0AE5DA781279F--><AD_FIELD>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <AD_FIELD_ID><![CDATA[122B819C6AC34B15B7F0AE5DA781279F]]></AD_FIELD_ID>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <NAME><![CDATA[Connector Calls Average]]></NAME>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <DESCRIPTION><![CDATA[Average number of Connector calls per day in last 30 days]]></DESCRIPTION>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <HELP><![CDATA[Average number of Connector calls per day in last 30 days]]></HELP>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <AD_TAB_ID><![CDATA[1005400006]]></AD_TAB_ID>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <AD_COLUMN_ID><![CDATA[F2D8CC6141A94EEA8454C2EAF001130D]]></AD_COLUMN_ID>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <SEQNO><![CDATA[440]]></SEQNO>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <GRID_SEQNO><![CDATA[440]]></GRID_SEQNO>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--122B819C6AC34B15B7F0AE5DA781279F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--122B819C6AC34B15B7F0AE5DA781279F--></AD_FIELD>
+
 <!--122F0AAD1AC44F85A979B9CF64C77F64--><AD_FIELD>
 <!--122F0AAD1AC44F85A979B9CF64C77F64-->  <AD_FIELD_ID><![CDATA[122F0AAD1AC44F85A979B9CF64C77F64]]></AD_FIELD_ID>
 <!--122F0AAD1AC44F85A979B9CF64C77F64-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -171178,6 +171205,33 @@
 <!--532FD4B7469C45BBB47F46CCBA15E450-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--532FD4B7469C45BBB47F46CCBA15E450--></AD_FIELD>
 
+<!--5364EFCD00C549E89F69277501B07C6C--><AD_FIELD>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <AD_FIELD_ID><![CDATA[5364EFCD00C549E89F69277501B07C6C]]></AD_FIELD_ID>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <NAME><![CDATA[WS Rejected Average]]></NAME>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <DESCRIPTION><![CDATA[Average number of  rejected Web Service calls per day in last 30 days]]></DESCRIPTION>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <HELP><![CDATA[Average number of  rejected Web Service calls per day in last 30 days]]></HELP>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <AD_TAB_ID><![CDATA[1005400006]]></AD_TAB_ID>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <AD_COLUMN_ID><![CDATA[926DB31AD14D4A49BE77D6A3E6105987]]></AD_COLUMN_ID>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <SEQNO><![CDATA[460]]></SEQNO>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <GRID_SEQNO><![CDATA[460]]></GRID_SEQNO>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--5364EFCD00C549E89F69277501B07C6C-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--5364EFCD00C549E89F69277501B07C6C--></AD_FIELD>
+
 <!--537C71BB04004A20916787D665752EC7--><AD_FIELD>
 <!--537C71BB04004A20916787D665752EC7-->  <AD_FIELD_ID><![CDATA[537C71BB04004A20916787D665752EC7]]></AD_FIELD_ID>
 <!--537C71BB04004A20916787D665752EC7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -179340,33 +179394,6 @@
 <!--5EABE33B3B8949A587688CB44D332FE3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--5EABE33B3B8949A587688CB44D332FE3--></AD_FIELD>
 
-<!--5F62CEE88A0242E8831C30F807A3F93C--><AD_FIELD>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <AD_FIELD_ID><![CDATA[5F62CEE88A0242E8831C30F807A3F93C]]></AD_FIELD_ID>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <NAME><![CDATA[WS Calls Total]]></NAME>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <DESCRIPTION><![CDATA[Total number of Web Service calls in last 30 days]]></DESCRIPTION>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <HELP><![CDATA[Total number of Web Service calls in last 30 days]]></HELP>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <AD_TAB_ID><![CDATA[1005400006]]></AD_TAB_ID>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <AD_COLUMN_ID><![CDATA[C78D3A595D5345C6A57F3063E88702F6]]></AD_COLUMN_ID>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <SEQNO><![CDATA[410]]></SEQNO>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <GRID_SEQNO><![CDATA[410]]></GRID_SEQNO>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--5F62CEE88A0242E8831C30F807A3F93C-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--5F62CEE88A0242E8831C30F807A3F93C--></AD_FIELD>
-
 <!--5F7067CB241847DF8CEB789EF292B899--><AD_FIELD>
 <!--5F7067CB241847DF8CEB789EF292B899-->  <AD_FIELD_ID><![CDATA[5F7067CB241847DF8CEB789EF292B899]]></AD_FIELD_ID>
 <!--5F7067CB241847DF8CEB789EF292B899-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -179421,6 +179448,33 @@
 <!--5F82C468A1B7479DBA6E05A58A72D212-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--5F82C468A1B7479DBA6E05A58A72D212--></AD_FIELD>
 
+<!--5FDA964FC10B4D489003E9214261880F--><AD_FIELD>
+<!--5FDA964FC10B4D489003E9214261880F-->  <AD_FIELD_ID><![CDATA[5FDA964FC10B4D489003E9214261880F]]></AD_FIELD_ID>
+<!--5FDA964FC10B4D489003E9214261880F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5FDA964FC10B4D489003E9214261880F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5FDA964FC10B4D489003E9214261880F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5FDA964FC10B4D489003E9214261880F-->  <NAME><![CDATA[Connector Calls Max]]></NAME>
+<!--5FDA964FC10B4D489003E9214261880F-->  <DESCRIPTION><![CDATA[Maximum number of Connector calls per day in last 30 days]]></DESCRIPTION>
+<!--5FDA964FC10B4D489003E9214261880F-->  <HELP><![CDATA[Maximum number of Connector calls per day in last 30 days]]></HELP>
+<!--5FDA964FC10B4D489003E9214261880F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--5FDA964FC10B4D489003E9214261880F-->  <AD_TAB_ID><![CDATA[1005400006]]></AD_TAB_ID>
+<!--5FDA964FC10B4D489003E9214261880F-->  <AD_COLUMN_ID><![CDATA[5797D098AFB7437AA54CC596DDC65265]]></AD_COLUMN_ID>
+<!--5FDA964FC10B4D489003E9214261880F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--5FDA964FC10B4D489003E9214261880F-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--5FDA964FC10B4D489003E9214261880F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--5FDA964FC10B4D489003E9214261880F-->  <SEQNO><![CDATA[430]]></SEQNO>
+<!--5FDA964FC10B4D489003E9214261880F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--5FDA964FC10B4D489003E9214261880F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--5FDA964FC10B4D489003E9214261880F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5FDA964FC10B4D489003E9214261880F-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5FDA964FC10B4D489003E9214261880F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--5FDA964FC10B4D489003E9214261880F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5FDA964FC10B4D489003E9214261880F-->  <GRID_SEQNO><![CDATA[430]]></GRID_SEQNO>
+<!--5FDA964FC10B4D489003E9214261880F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--5FDA964FC10B4D489003E9214261880F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--5FDA964FC10B4D489003E9214261880F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--5FDA964FC10B4D489003E9214261880F--></AD_FIELD>
+
 <!--605B6EB2852573ACE040007F0100282B--><AD_FIELD>
 <!--605B6EB2852573ACE040007F0100282B-->  <AD_FIELD_ID><![CDATA[605B6EB2852573ACE040007F0100282B]]></AD_FIELD_ID>
 <!--605B6EB2852573ACE040007F0100282B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -190091,6 +190145,33 @@
 <!--85DFCF53E3914632ACE913477CB7CE94-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--85DFCF53E3914632ACE913477CB7CE94--></AD_FIELD>
 
+<!--85EADA0A818A49AE8C2E3DEF14758BA5--><AD_FIELD>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <AD_FIELD_ID><![CDATA[85EADA0A818A49AE8C2E3DEF14758BA5]]></AD_FIELD_ID>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <NAME><![CDATA[WS Rejected Maximum]]></NAME>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <DESCRIPTION><![CDATA[Maximum number of Web Service rejected calls per day in last 30 days]]></DESCRIPTION>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <HELP><![CDATA[Maximum number of Web Service rejected calls per day in last 30 days]]></HELP>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <AD_TAB_ID><![CDATA[1005400006]]></AD_TAB_ID>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <AD_COLUMN_ID><![CDATA[75383B2897FE493E886439C075F5CE8A]]></AD_COLUMN_ID>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <SEQNO><![CDATA[450]]></SEQNO>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <GRID_SEQNO><![CDATA[450]]></GRID_SEQNO>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--85EADA0A818A49AE8C2E3DEF14758BA5--></AD_FIELD>
+
 <!--8618F92B88A545F495411B9ED339E4EA--><AD_FIELD>
 <!--8618F92B88A545F495411B9ED339E4EA-->  <AD_FIELD_ID><![CDATA[8618F92B88A545F495411B9ED339E4EA]]></AD_FIELD_ID>
 <!--8618F92B88A545F495411B9ED339E4EA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -197140,14 +197221,14 @@
 <!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
 <!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <SEQNO><![CDATA[420]]></SEQNO>
+<!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <SEQNO><![CDATA[410]]></SEQNO>
 <!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <GRID_SEQNO><![CDATA[420]]></GRID_SEQNO>
+<!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <GRID_SEQNO><![CDATA[410]]></GRID_SEQNO>
 <!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--AAEB4DCC42B943B8B220D87F7EADC1C9-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -209469,14 +209550,14 @@
 <!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
 <!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <SEQNO><![CDATA[430]]></SEQNO>
+<!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <SEQNO><![CDATA[420]]></SEQNO>
 <!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <GRID_SEQNO><![CDATA[430]]></GRID_SEQNO>
+<!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <GRID_SEQNO><![CDATA[420]]></GRID_SEQNO>
 <!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--E7BACF4345EB4CEC98DC383CAF1B6D7E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
--- a/src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java	Wed Dec 14 09:03:54 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java	Wed Dec 14 11:07:10 2011 +0100
@@ -376,13 +376,6 @@
         }
 
         try {
-          hbLog.setWSCallsTotal(Long.parseLong(systemInfo
-              .getProperty(SystemInfo.Item.WS_CALLS_TOTAL.getLabel())));
-        } catch (NumberFormatException e) {
-          log.warn("Incorrect total number of ws calls during last 30 days: "
-              + systemInfo.getProperty(SystemInfo.Item.WS_CALLS_TOTAL.getLabel()));
-        }
-        try {
           hbLog.setWSCallsMaximum(Long.parseLong(systemInfo
               .getProperty(SystemInfo.Item.WS_CALLS_MAX.getLabel())));
         } catch (NumberFormatException e) {
@@ -398,6 +391,21 @@
         }
 
         try {
+          hbLog.setWSRejectedMaximum(Long.parseLong(systemInfo
+              .getProperty(SystemInfo.Item.WSR_CALLS_MAX.getLabel())));
+        } catch (NumberFormatException e) {
+          log.warn("Incorrect max number of ws rejected calls during last 30 days: "
+              + systemInfo.getProperty(SystemInfo.Item.WSR_CALLS_MAX.getLabel()));
+        }
+        try {
+          hbLog.setWSRejectedAverage(new BigDecimal(systemInfo
+              .getProperty(SystemInfo.Item.WSR_CALLS_AVG.getLabel())));
+        } catch (NumberFormatException e) {
+          log.warn("Incorrect avg number of ws rejected calls during last 30 days: "
+              + systemInfo.getProperty(SystemInfo.Item.WSR_CALLS_AVG.getLabel()));
+        }
+
+        try {
           hbLog.setNumberOfClients(Long.parseLong(systemInfo
               .getProperty(SystemInfo.Item.NUMBER_OF_CLIENTS.getLabel())));
         } catch (NumberFormatException e) {
--- a/src/org/openbravo/erpCommon/utility/SystemInfo.java	Wed Dec 14 09:03:54 2011 +0100
+++ b/src/org/openbravo/erpCommon/utility/SystemInfo.java	Wed Dec 14 11:07:10 2011 +0100
@@ -89,9 +89,13 @@
   private static String databaseIdentifier;
 
   private static long maxDayWsLogins;
-  private static long totalWsLogins;
   private static BigDecimal avgWsLogins = BigDecimal.ZERO;
 
+  private static long maxDayWsCLogins;
+  private static BigDecimal avgWsCLogins = BigDecimal.ZERO;
+  private static long maxDayRejectedWsLogins;
+  private static BigDecimal avgRejectedWsLogins;
+
   static {
     systemInfo = new HashMap<Item, String>();
     sd = new SimpleDateFormat("dd-MM-yyyy");
@@ -230,15 +234,24 @@
       case TOTAL_LOGINS_LAST_MOTH:
         systemInfo.put(i, Integer.toString(numberOfLoginsThisMonth));
         break;
-      case WS_CALLS_TOTAL:
-        systemInfo.put(i, Long.toString(totalWsLogins));
-        break;
       case WS_CALLS_MAX:
         systemInfo.put(i, Long.toString(maxDayWsLogins));
         break;
       case WS_CALLS_AVG:
         systemInfo.put(i, avgWsLogins.toString());
         break;
+      case WSR_CALLS_MAX:
+        systemInfo.put(i, Long.toString(maxDayRejectedWsLogins));
+        break;
+      case WSR_CALLS_AVG:
+        systemInfo.put(i, avgRejectedWsLogins.toString());
+        break;
+      case WSC_CALLS_MAX:
+        systemInfo.put(i, Long.toString(maxDayWsCLogins));
+        break;
+      case WSC_CALLS_AVG:
+        systemInfo.put(i, avgWsCLogins.toString());
+        break;
       case NUMBER_OF_CLIENTS:
         systemInfo.put(i, getNumberOfClients());
         break;
@@ -697,18 +710,9 @@
           + usagePercentageTime.toString() + "% avg usr:" + avgUsers.toString());
 
       // WS calls
-      hql = new StringBuilder();
-      hql.append("select count(*)\n");
-      hql.append("  from ADSession\n");
-      hql.append(" where loginStatus = 'WS'\n");
-      hql.append("   and creationDate > :firstDay\n");
-      hql.append(" group by day(creationDate), month(creationDate), year(creationDate)\n");
-      Query qWs = OBDal.getInstance().getSession().createQuery(hql.toString());
-      qWs.setParameter("firstDay", startOfPeriod.getTime());
       maxDayWsLogins = 0L;
-      totalWsLogins = 0L;
-      for (Object s : qWs.list()) {
-        long dayWsLogins = (Long) s;
+      long totalWsLogins = 0L;
+      for (Long dayWsLogins : getWsLogins("WS", startOfPeriod.getTime())) {
         totalWsLogins += dayWsLogins;
         if (dayWsLogins > maxDayWsLogins) {
           maxDayWsLogins = dayWsLogins;
@@ -719,6 +723,34 @@
       log4j.debug("WS Calls: total:" + totalWsLogins + " - max:" + maxDayWsLogins + " - avg:"
           + avgWsLogins.toString());
 
+      // Rejected WS calls
+      maxDayRejectedWsLogins = 0L;
+      long totalRejectedWsLogins = 0L;
+      for (Long dayRWsLogins : getWsLogins("WSR", startOfPeriod.getTime())) {
+        totalRejectedWsLogins += dayRWsLogins;
+        if (dayRWsLogins > maxDayRejectedWsLogins) {
+          maxDayRejectedWsLogins = dayRWsLogins;
+        }
+      }
+      avgRejectedWsLogins = BigDecimal.valueOf(totalRejectedWsLogins).divide(
+          BigDecimal.valueOf(30), 3, RoundingMode.HALF_DOWN);
+      log4j.debug("WS Rejected Calls: total:" + totalRejectedWsLogins + " - max:"
+          + maxDayRejectedWsLogins + " - avg:" + avgRejectedWsLogins.toString());
+
+      // Connector calls
+      maxDayWsCLogins = 0L;
+      long totalWsCLogins = 0L;
+      for (Long dayWsCLogins : getWsLogins("WSC", startOfPeriod.getTime())) {
+        totalWsCLogins += dayWsCLogins;
+        if (dayWsCLogins > maxDayWsCLogins) {
+          maxDayWsCLogins = dayWsCLogins;
+        }
+      }
+      avgWsCLogins = BigDecimal.valueOf(totalWsCLogins).divide(BigDecimal.valueOf(30), 3,
+          RoundingMode.HALF_DOWN);
+      log4j.debug("WSC Calls: total:" + totalWsCLogins + " - max:" + maxDayWsCLogins + " - avg:"
+          + avgWsCLogins.toString());
+
       log4j
           .debug("Total time computing sessions:" + (System.currentTimeMillis() - computationTime));
     } catch (Exception e) {
@@ -727,6 +759,20 @@
 
   }
 
+  @SuppressWarnings("unchecked")
+  private static List<Long> getWsLogins(String type, Date fromDate) {
+    StringBuilder hql = new StringBuilder();
+    hql.append("select count(*)\n");
+    hql.append("  from ADSession\n");
+    hql.append(" where loginStatus = :type\n");
+    hql.append("   and creationDate > :firstDay\n");
+    hql.append(" group by day(creationDate), month(creationDate), year(creationDate)\n");
+    Query qWs = OBDal.getInstance().getSession().createQuery(hql.toString());
+    qWs.setParameter("firstDay", fromDate);
+    qWs.setParameter("type", type);
+    return qWs.list();
+  }
+
   private static void calculateNumberOfRejectedLoginsDueConcurrentUsersLastMonth(
       Calendar startOfPeriod) {
     OBCriteria<Session> qSession = OBDal.getInstance().createCriteria(Session.class);
@@ -791,8 +837,9 @@
         false), NUMBER_OF_ORGS("orgNum", false), USAGE_AUDIT("usageAudit", false), INSTANCE_PURPOSE(
         "instancePurpose", false), REJECTED_LOGINS_DUE_CONC_USERS("rejectedLoginsDueConcUsers",
         false), INSTANCE_NUMBER("instanceNo", false), CUSTOM_QUERY_ENABLED("enabledCustomQuery",
-        false), WS_CALLS_TOTAL("wsCallsTotal", false), WS_CALLS_MAX("wsCallsMax", false), WS_CALLS_AVG(
-        "wsCallsAvg", false);
+        false), WS_CALLS_MAX("wsCallsMax", false), WS_CALLS_AVG("wsCallsAvg", false), WSC_CALLS_MAX(
+        "wscCallsMax", false), WSC_CALLS_AVG("wscCallsAvg", false), WSR_CALLS_MAX(
+        "wsRejectedCallsMax", false), WSR_CALLS_AVG("wsRejectedCallsAvg", false);
 
     private String label;
     private boolean isIdInfo;