diff -ruN ./a/siremis/modules/ser/mod.xml ./b/siremis/modules/ser/mod.xml
--- ./a/siremis/modules/ser/mod.xml	2011-08-23 22:58:20.000000000 +0100
+++ ./b/siremis/modules/ser/mod.xml	2011-08-24 16:30:52.000000000 +0100
@@ -77,8 +77,12 @@
 					URL="{@home:url}/ser/watchers_list" Order="20"/>
 				<MenuItem Name="System.Ser.Prs.Presentity" Title="Presentity List" Description=""
 					URL="{@home:url}/ser/presentity_list" Order="30"/>
+				<MenuItem Name="System.Ser.Prs.RlsWatchers" Title="RLS Watchers List" Description=""
+					URL="{@home:url}/ser/rls_watchers_list" Order="40"/>
+				<MenuItem Name="System.Ser.Prs.RlsPresentity" Title="RLS Presentity List" Description=""
+					URL="{@home:url}/ser/rls_presentity_list" Order="50"/>				
 				<MenuItem Name="System.Ser.Prs.Xcap" Title="XCAP List" Description=""
-					URL="{@home:url}/ser/xcap_list" Order="40"/>
+					URL="{@home:url}/ser/xcap_list" Order="60"/>
 			</MenuItem>	
 			<MenuItem Name="System.Ser.Cms" Title="Command Services" Parent="System.Ser" Order="70">
 				<MenuItem Name="System.Ser.Cms.Micmds" Title="MI Commands" Description=""
diff -ruN ./a/siremis/modules/ser/prs/presence/do/RlsPresentityDO.php ./b/siremis/modules/ser/prs/presence/do/RlsPresentityDO.php
--- ./a/siremis/modules/ser/prs/presence/do/RlsPresentityDO.php	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/do/RlsPresentityDO.php	2011-08-24 16:14:28.000000000 +0100
@@ -0,0 +1,81 @@
+<?PHP
+include_once(OPENBIZ_BIN.'data/BizDataObj.php');
+
+class RlsPresentityDO extends BizDataObj
+{
+    var $fields = array('expires','updated');
+    /**
+     * Fetches SQL result rows as a sequential array according the query rules set before.
+     *
+     * @return array array of records
+     */
+    public function fetch()
+    {
+        $resultRecords = array();
+        $resultSet = $this->_run_search($this->m_Limit);  // regular search or page search
+        if ($resultSet !== null)
+		{
+            while ($recArray = $this->_fetch_record($resultSet))
+			{
+				$pstatefields = array('presence_state','presence_state_detail');
+				if(isset($recArray[$pstatefields[0]]))
+				{
+					$tmp = $recArray[$pstatefields[0]];
+					$tmp = str_replace("<", "&lt;", $tmp);
+					$tmp = str_replace(">", "&gt;", $tmp);
+					$recArray[$pstatefields[0]] = $tmp;
+					$tmp = preg_replace('#([A-Z]+ sip:[^ ]+ SIP/2.0)%%#i', '<font color=#336600>${1}</font>%%', $tmp, -1);
+					$tmp = preg_replace('#(SIP/2.0 [1-6][0-9][0-9] [^%]+)%%#i', '<font color=#336600>${1}</font>%%', $tmp, -1);
+					$tmp = preg_replace('#%%([^ :%]+): (.+)%%#im', '%%<font color=red>$1</font>: $2%%', $tmp, -1, $count);
+					while($count>0)
+						$tmp = preg_replace('#%%([^ :%<]+): (.+)%%#im', '%%<font color=red>$1</font>: $2%%', $tmp, -1, $count);
+					$recArray[$pstatefields[1]] = "<pre>" . $tmp . "</pre>";
+				}
+				foreach($this->fields as $datefield)
+				{
+					if(isset($recArray[$datefield]))
+					{
+						$time = $recArray[$datefield];
+						$recArray[$datefield] = date('Y-m-d H:i:s',$time);
+					}
+				}
+                $resultRecords[] = $recArray;
+            }
+        }
+        else
+            return null;
+
+        return $resultRecords;
+    }
+
+	public function updateRecord($recArr, $oldRecord=null)
+	{
+		foreach($this->fields as $field)
+		{
+			if(isset($recArr[$field]))
+			{
+				$datetime = explode(' ',$recArr[$field]);
+				$date = explode('-',$datetime[0]);
+				$time = explode(':',$datetime[1]);
+				$recArr[$field] = mktime((int)$time[0],(int)$time[1],(int)$time[2],(int)$date[1],(int)$date[2],(int)$date[0]);
+			}
+		}
+		return parent::updateRecord($recArr, $oldRecord);
+	}
+	
+	public function insertRecord($recArr)
+	{
+		foreach($this->fields as $field)
+		{
+			if(isset($recArr[$field]))
+			{
+				$datetime = explode(' ',$recArr[$field]);
+				$date = explode('-',$datetime[0]);
+				$time = explode(':',$datetime[1]);
+				$recArr[$field] = mktime((int)$time[0],(int)$time[1],(int)$time[2],(int)$date[1],(int)$date[2],(int)$date[0]);
+			}
+		}
+		return parent::insertRecord($recArr);
+	}
+}
+?>
diff -ruN ./a/siremis/modules/ser/prs/presence/do/RlsPresentityDO.xml ./b/siremis/modules/ser/prs/presence/do/RlsPresentityDO.xml
--- ./a/siremis/modules/ser/prs/presence/do/RlsPresentityDO.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/do/RlsPresentityDO.xml	2011-08-23 17:12:01.000000000 +0100
@@ -0,0 +1,18 @@
+<?xml version="1.0" standalone="no"?>
+<BizDataObj Name="RlsPresentityDO" Description="" Class="ser.prs.presence.do.RlsPresentityDO" DBName="Serdb" Table="rls_presentity" SearchRule="" SortRule="" OtherSQLRule="" Uniqueness=";" Stateless="N" IdGeneration="Identity" CacheLifeTime="0">
+	<BizFieldList>
+        <BizField Name="Id" Column="id" Type="Number"/>
+        <BizField Name="rlsubs_did" Column="rlsubs_did" Length="255" Required="Y" Type="Text"/>
+        <BizField Name="resource_uri" Column="resource_uri" Length="128" Required="Y" Type="Text"/>
+        <BizField Name="content_type" Column="content_type" Length="64" Required="Y" Type="Text"/>
+        <BizField Name="presence_state" Column="presence_state" Length="255" Required="Y" Type="Text"/>
+        <BizField Name="expires" Column="expires" Required="Y" Type="Number"/>
+        <BizField Name="updated" Column="updated" Required="Y" Type="Number"/>
+        <BizField Name="auth_state" Column="auth_state" Required="Y" Type="Number"/>
+        <BizField Name="reason" Column="reason" Length="64" Required="Y" Type="Text"/>
+	</BizFieldList>
+    <TableJoins>
+    </TableJoins>
+    <ObjReferences>
+    </ObjReferences>
+</BizDataObj>
diff -ruN ./a/siremis/modules/ser/prs/presence/do/RlsWatchersDO.php ./b/siremis/modules/ser/prs/presence/do/RlsWatchersDO.php
--- ./a/siremis/modules/ser/prs/presence/do/RlsWatchersDO.php	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/do/RlsWatchersDO.php	2011-08-24 16:14:08.000000000 +0100
@@ -0,0 +1,74 @@
+<?PHP
+include_once(OPENBIZ_BIN.'data/BizDataObj.php');
+
+class RlsWatchersDO extends BizDataObj
+{
+    var $fields = array('expires');
+
+    public function fetch()
+    {
+        $resultRecords = array();
+        $resultSet = $this->_run_search($this->m_Limit);  // regular search or page search
+        if ($resultSet !== null)
+		{
+            while ($recArray = $this->_fetch_record($resultSet))
+			{
+				$recroutefields = array('record_route','record_route_detail');
+				if(isset($recArray[$recroutefields[0]]))
+				{
+					$tmp = $recArray[$recroutefields[0]];
+					$tmp = str_replace("<", "&lt;", $tmp);
+					$tmp = str_replace(">", "&gt;", $tmp);
+					$recArray[$recroutefields[0]] = $tmp;
+					$tmp = preg_replace('#([A-Z]+ sip:[^ ]+ SIP/2.0)%%#i', '<font color=#336600>${1}</font>%%', $tmp, -1);
+					$tmp = preg_replace('#(SIP/2.0 [1-6][0-9][0-9] [^%]+)%%#i', '<font color=#336600>${1}</font>%%', $tmp, -1);
+					$tmp = preg_replace('#%%([^ :%]+): (.+)%%#im', '%%<font color=red>$1</font>: $2%%', $tmp, -1, $count);
+					while($count>0)
+						$tmp = preg_replace('#%%([^ :%<]+): (.+)%%#im', '%%<font color=red>$1</font>: $2%%', $tmp, -1, $count);
+					$recArray[$recroutefields[1]] = "<pre>" . $tmp . "</pre>";
+				}
+				
+				foreach($this->fields as $field){
+					if(isset($recArray[$field]))
+					{
+						$time = $recArray[$field];
+						$recArray[$field] = date('Y-m-d H:i:s',$time);
+					}
+				}
+                $resultRecords[] = $recArray;
+            }
+        }
+        else
+            return null;
+
+        return $resultRecords;
+    }
+
+	
+	public function updateRecord($recArr, $oldRecord=null)
+	{
+		foreach($this->fields as $field){
+			if(isset($recArr[$field])){
+				$datetime = explode(' ',$recArr[$field]);
+				$date = explode('-',$datetime[0]);
+				$time = explode(':',$datetime[1]);
+				$recArr[$field] = mktime((int)$time[0],(int)$time[1],(int)$time[2],(int)$date[1],(int)$date[2],(int)$date[0]);
+			}
+		}
+		return parent::updateRecord($recArr, $oldRecord);
+	}
+	
+	public function insertRecord($recArr)
+	{
+		foreach($this->fields as $field){
+			if(isset($recArr[$field])){
+				$datetime = explode(' ',$recArr[$field]);
+				$date = explode('-',$datetime[0]);
+				$time = explode(':',$datetime[1]);
+				$recArr[$field] = mktime((int)$time[0],(int)$time[1],(int)$time[2],(int)$date[1],(int)$date[2],(int)$date[0]);
+			}
+		}
+		return parent::insertRecord($recArr);
+	}
+}
+?>
diff -ruN ./a/siremis/modules/ser/prs/presence/do/RlsWatchersDO.xml ./b/siremis/modules/ser/prs/presence/do/RlsWatchersDO.xml
--- ./a/siremis/modules/ser/prs/presence/do/RlsWatchersDO.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/do/RlsWatchersDO.xml	2011-08-01 15:19:16.000000000 +0100
@@ -0,0 +1,30 @@
+<?xml version="1.0" standalone="no"?>
+<BizDataObj Name="RlsWatchersDO" Description="" Class="ser.prs.presence.do.RlsWatchersDO" DBName="Serdb" Table="rls_watchers" SearchRule="" SortRule="" OtherSQLRule="" Uniqueness="presentity_uri,watcher_username,watcher_domain,event;" Stateless="N" IdGeneration="Identity" CacheLifeTime="0">
+	<BizFieldList>
+        <BizField Name="Id" Column="id"     Type="Number"/>
+        <BizField Name="presentity_uri" Column="presentity_uri" Length="128"   Required="Y" Type="Text"/>
+        <BizField Name="watcher_username" Column="watcher_username" Length="64"   Required="Y" Type="Text"/>
+        <BizField Name="watcher_domain" Column="watcher_domain" Length="64"   Required="Y" Type="Text"/>
+        <BizField Name="to_user" Column="to_user" Length="64"   Required="Y" Type="Text"/>
+        <BizField Name="to_domain" Column="to_domain" Length="64"   Required="Y" Type="Text"/>
+        <BizField Name="event" Column="event" Length="64" DefaultValue="presence"  Required="Y" Type="Text"/>
+        <BizField Name="event_id" Column="event_id" Length="64"   Required="N" Type="Text"/>
+        <BizField Name="to_tag" Column="to_tag" Length="64"   Required="Y" Type="Text"/>
+        <BizField Name="from_tag" Column="from_tag" Length="64"   Required="Y" Type="Text"/>
+        <BizField Name="callid" Column="callid" Length="64"   Required="Y" Type="Text"/>
+        <BizField Name="local_cseq" Column="local_cseq"    Required="Y" Type="Number"/>
+        <BizField Name="remote_cseq" Column="remote_cseq"    Required="Y" Type="Number"/>
+        <BizField Name="contact" Column="contact" Length="64"   Required="Y" Type="Text"/>
+        <BizField Name="record_route" Column="record_route"    Required="N" Type="Text"/>
+        <BizField Name="expires" Column="expires"    Required="Y" Type="Number"/>
+        <BizField Name="status" Column="status"  DefaultValue="2"  Required="Y" Type="Number"/>
+        <BizField Name="reason" Column="reason" Length="64"   Required="Y" Type="Text"/>
+        <BizField Name="version" Column="version"    Required="Y" Type="Number"/>
+        <BizField Name="socket_info" Column="socket_info" Length="64"   Required="Y" Type="Text"/>
+        <BizField Name="local_contact" Column="local_contact" Length="128"   Required="Y" Type="Text"/>
+	</BizFieldList>
+    <TableJoins>
+    </TableJoins>
+    <ObjReferences>
+    </ObjReferences>
+</BizDataObj>
\ No newline at end of file
diff -ruN ./a/siremis/modules/ser/prs/presence/form/RlsPresentityCopyForm.xml ./b/siremis/modules/ser/prs/presence/form/RlsPresentityCopyForm.xml
--- ./a/siremis/modules/ser/prs/presence/form/RlsPresentityCopyForm.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/form/RlsPresentityCopyForm.xml	2011-08-01 15:19:23.000000000 +0100
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EasyForm Name="RlsPresentityCopyForm" Class="EasyForm" FormType="Edit" jsClass="jbForm" Title="Copy RLS Presentity" Description="" BizDataObj="ser.prs.presence.do.RlsPresentityDO" TemplateEngine="Smarty" TemplateFile="detail.tpl" EventName="" MessageFile="">
+    <DataPanel>
+        <Element Name="fld_Id" Class="Hidden" FieldName="Id" Label="Id" AllowURLParam="Y"/>	
+		<Element Name="fld_rlsubs_did" Class="InputText" FieldName="rlsubs_did" Label="Rlsubs did"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_resource_uri" Class="InputText" FieldName="resource_uri" Label="Resource URI"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_content_type" Class="InputText" FieldName="content_type" Label="Content Type"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_presence_state" Class="Textarea" FieldName="presence_state" Label="Presence State" AllowURLParam="N" CssClass="input_textarea" CssErrorClass="input_textarea_error" CssFocusClass="input_textarea_focus"/>
+		<Element Name="fld_expires" Class="InputDatetime" FieldName="expires" Label="Expires" DefaultValue="1970-01-01 00:00:00" Sortable="Y" AllowURLParam="N" Translatable="N" OnEventLog="N"  CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_updated" Class="InputDatetime" FieldName="updated" Label="Updated" DefaultValue="1970-01-01 00:00:00" Sortable="Y" AllowURLParam="N" Translatable="N" OnEventLog="N"  CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_auth_state" Class="InputText" FieldName="auth_state" Label="Auth State"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_reason" Class="InputText" FieldName="reason" Label="Reason"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+    </DataPanel>
+    <ActionPanel>
+        <Element Name="btn_save" Class="Button" Text="Save" CssClass="button_gray_m">
+            <EventHandler Name="save_onclick" EventLogMsg="" Event="onclick" Function="InsertRecord()" RedirectPage="form=ser.prs.presence.form.RlsPresentityDetailForm&amp;fld:Id={@ser.prs.presence.do.RlsPresentityDO:Field[Id].Value}"  ShortcutKey="Ctrl+Enter" ContextMenu="Save" />
+        </Element>
+        <Element Name="btn_cancel" Class="Button" Text="Cancel" CssClass="button_gray_m">
+            <EventHandler Name="cancel_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsPresentityListForm)"  ShortcutKey="Escape" ContextMenu="Cancel"/>
+        </Element>
+    </ActionPanel> 
+    <NavPanel>
+    </NavPanel> 
+    <SearchPanel>
+    </SearchPanel>
+</EasyForm>
diff -ruN ./a/siremis/modules/ser/prs/presence/form/RlsPresentityDetailForm.xml ./b/siremis/modules/ser/prs/presence/form/RlsPresentityDetailForm.xml
--- ./a/siremis/modules/ser/prs/presence/form/RlsPresentityDetailForm.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/form/RlsPresentityDetailForm.xml	2011-08-02 10:48:00.000000000 +0100
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EasyForm Name="RlsPresentityDetailForm" Class="EasyForm" FormType="" jsClass="jbForm" Title="RLS Presentity Detail" Description="" BizDataObj="ser.prs.presence.do.RlsPresentityDO" TemplateEngine="Smarty" TemplateFile="detail_elementset.tpl" EventName="" MessageFile="">
+    <DataPanel>
+		<Element Name="fld_Id" ElementSet="General" Hidden="Y" Class="LabelText" FieldName="Id" Label="Id" AllowURLParam="Y"/>
+		<Element Name="fld_rlsubs_did" ElementSet="General" Class="LabelText" FieldName="rlsubs_did" Label="Rlsubs did" AllowURLParam="N"/>
+       	<Element Name="fld_resource_uri" ElementSet="General" Class="LabelText" FieldName="resource_uri" Label="Resource URI" AllowURLParam="N"/>
+       	<Element Name="fld_content_type" ElementSet="General" Class="LabelText" FieldName="content_type" Label="Content Type" AllowURLParam="N"/>
+		<Element Name="fld_presence_state_detail" ElementSet="General" Class="LabelText" FieldName="presence_state_detail" Label="Presence State" AllowURLParam="N" />
+       	<Element Name="fld_expires" ElementSet="General" Class="LabelText" FieldName="expires" Label="Expires" AllowURLParam="N"/>
+       	<Element Name="fld_updated" ElementSet="General" Class="LabelText" FieldName="updated" Label="Updated" AllowURLParam="N"/>
+       	<Element Name="fld_auth_state" ElementSet="General" Class="LabelText" FieldName="auth_state" Label="Auth State" AllowURLParam="N"/>
+       	<Element Name="fld_reason" ElementSet="General" Class="LabelText" FieldName="reason" Label="Reason" AllowURLParam="N"/>
+    </DataPanel>
+    <ActionPanel>       
+        <Element Name="btn_new" Class="Button" Text="Add" CssClass="button_gray_add" Description="new record (Insert)" Hidden="Y">
+			<EventHandler Name="btn_new_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsPresentityNewForm)"  ShortcutKey="Insert" ContextMenu="New" />
+        </Element>          
+        <Element Name="btn_edit" Class="Button" Text="Edit" CssClass="button_gray_m" Description="edit record (Ctrl+E)" Hidden="Y">
+			<EventHandler Name="btn_new_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsPresentityEditForm,{@:Elem[fld_Id].Value})"  ShortcutKey="Ctrl+E" ContextMenu="Edit" />
+        </Element>
+		<Element Name="btn_copy" Class="Button" Text="Copy" CssClass="button_gray_m" Description="copy record (Ctrl+C)" Hidden="Y">
+            <EventHandler Name="onclick" Event="onclick" EventLogMsg="" Function="CopyRecord({@:Elem[fld_Id].Value})" RedirectPage="form=ser.prs.presence.form.RlsPresentityCopyForm&amp;fld:Id={@:Elem[fld_Id].Value}" ShortcutKey="Ctrl+C" ContextMenu="Copy"/>
+        </Element> 
+        <Element Name="btn_delete" Class="Button" Text="Delete" CssClass="button_gray_m" Description="delete record (Delete)">
+            <EventHandler Name="del_onclick" Event="onclick" EventLogMsg="" Function="DeleteRecord({@:Elem[fld_Id].Value})"  RedirectPage="form=ser.prs.presence.form.RlsPresentityListForm" ShortcutKey="Ctrl+Delete" ContextMenu="Delete" />
+        </Element>
+        <Element Name="btn_cancel" Class="Button" Text="Back" CssClass="button_gray_m">
+            <EventHandler Name="btn_cancel_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsPresentityListForm)"  ShortcutKey="Escape" ContextMenu="Cancel" />
+        </Element>         
+    </ActionPanel> 
+    <NavPanel>
+    </NavPanel> 
+    <SearchPanel>
+    </SearchPanel>
+</EasyForm>
diff -ruN ./a/siremis/modules/ser/prs/presence/form/RlsPresentityEditForm.xml ./b/siremis/modules/ser/prs/presence/form/RlsPresentityEditForm.xml
--- ./a/siremis/modules/ser/prs/presence/form/RlsPresentityEditForm.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/form/RlsPresentityEditForm.xml	2011-08-01 15:19:24.000000000 +0100
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EasyForm Name="RlsPresentityEditForm" Class="EasyForm" FormType="Edit" jsClass="jbForm" Title="Edit RLS Presentity" Description="" BizDataObj="ser.prs.presence.do.RlsPresentityDO" DefaultForm="Y" TemplateEngine="Smarty" TemplateFile="detail.tpl" EventName="" MessageFile="">
+    <DataPanel>
+		<Element Name="fld_Id" Class="Hidden" FieldName="Id" Label="Id" AllowURLParam="Y" Translatable="N" OnEventLog="N" CssClass="input" CssErrorClass="input_error"/>
+		<Element Name="fld_rlsubs_did" Class="InputText" FieldName="rlsubs_did" Label="Rlsubs did"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_resource_uri" Class="InputText" FieldName="resource_uri" Label="Resource URI"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_content_type" Class="InputText" FieldName="content_type" Label="Content Type"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_presence_state" Class="Textarea" FieldName="presence_state" Label="Presence State" AllowURLParam="N" CssClass="input_textarea" CssErrorClass="input_textarea_error" CssFocusClass="input_textarea_focus"/>
+		<Element Name="fld_expires" Class="InputDatetime" FieldName="expires" Label="Expires" DefaultValue="1970-01-01 00:00:00" Sortable="Y" AllowURLParam="N" Translatable="N" OnEventLog="N"  CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_updated" Class="InputDatetime" FieldName="updated" Label="Updated" DefaultValue="1970-01-01 00:00:00" Sortable="Y" AllowURLParam="N" Translatable="N" OnEventLog="N"  CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_auth_state" Class="InputText" FieldName="auth_state" Label="Auth State"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_reason" Class="InputText" FieldName="reason" Label="Reason"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+    </DataPanel>
+    <ActionPanel>
+        <Element Name="btn_save" Class="Button" Text="Save" CssClass="button_gray_m">
+            <EventHandler Name="save_onclick" Event="onclick" EventLogMsg=""  Function="UpdateRecord()" RedirectPage="form=ser.prs.presence.form.RlsPresentityDetailForm&amp;fld:Id={@ser.prs.presence.do.RlsPresentityDO:Field[Id].Value}" ShortcutKey="Ctrl+Enter" ContextMenu="Save" />
+        </Element>
+        <Element Name="btn_cancel" Class="Button" Text="Cancel" CssClass="button_gray_m">
+            <EventHandler Name="btn_cancel_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsPresentityListForm)"  ShortcutKey="Escape" ContextMenu="Cancel" />
+        </Element>
+    </ActionPanel> 
+    <NavPanel>
+    </NavPanel> 
+    <SearchPanel>
+    </SearchPanel>
+</EasyForm>
diff -ruN ./a/siremis/modules/ser/prs/presence/form/RlsPresentityListForm.xml ./b/siremis/modules/ser/prs/presence/form/RlsPresentityListForm.xml
--- ./a/siremis/modules/ser/prs/presence/form/RlsPresentityListForm.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/form/RlsPresentityListForm.xml	2011-08-05 12:17:06.000000000 +0100
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EasyForm Name="RlsPresentityListForm" Class="EasyForm" FormType="List" jsClass="jbForm" Title="RLS Presentity Management" Description="" BizDataObj="ser.prs.presence.do.RlsPresentityDO" PageSize="10" DefaultForm="Y" TemplateEngine="Smarty" TemplateFile="grid.tpl" EventName="" MessageFile="">
+    <DataPanel>
+        <Element Name="row_selections" Class="RowCheckbox" Label="" FieldName="Id"/>
+        <Element Name="fld_Id" Class="ColumnText" FieldName="Id" Label="Id" Sortable="Y" AllowURLParam="N" Link="javascript:">         
+         	<EventHandler Name="fld_Id_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsPresentityDetailForm,{@:Elem[fld_Id].Value})"/>
+        </Element>
+				<Element Name="fld_rlsubs_did" Class="ColumnText" FieldName="rlsubs_did" Label="Rlsubs did" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_resource_uri" Class="ColumnText" FieldName="resource_uri" Label="Resource URI" Sortable="Y"  Link="javascript:">
+					<EventHandler Name="fld_resource_uri_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsPresentityDetailForm,{@:Elem[fld_Id].Value})"/>
+				</Element>
+                <Element Name="fld_content_type" Class="ColumnText" FieldName="content_type" Label="Content Type" Sortable="Y"/>
+				<Element Name="fld_presence_state" Class="ColumnText" FieldName="presence_state" Label="Presence State" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_updated" Class="ColumnText" FieldName="updated" Label="Updated" Sortable="Y"/>
+                <Element Name="fld_auth_state" Class="ColumnText" FieldName="auth_state" Label="Auth State" Sortable="Y"/>
+                <Element Name="fld_reason" Class="ColumnText" FieldName="reason" Label="Reason" Sortable="Y" Hidden="Y"/>
+				<Element Name="fld_expires" Class="ColumnText" FieldName="expires" Label="Expires"/>
+    </DataPanel>
+    <ActionPanel>
+        <Element Name="lnk_new" Class="Button" Text="Add" CssClass="button_gray_add" Hidden="Y" Description="new record (Insert)">
+            <EventHandler Name="lnk_new_onclick" Event="onclick" EventLogMsg="" Function="SwitchForm(ser.prs.presence.form.RlsPresentityNewForm)" ShortcutKey="Insert" ContextMenu="New"/>
+        </Element>
+        <Element Name="btn_edit" Class="Button" Text="Edit" CssClass="button_gray_m" Hidden="Y" Description="edit record (Ctrl+E)">
+            <EventHandler Name="btn_edit_onclick" Event="onclick" EventLogMsg="" Function="EditRecord()" RedirectPage="form=ser.prs.presence.form.RlsPresentityEditForm&amp;fld:Id={@:Elem[fld_Id].Value}" ShortcutKey="Ctrl+E" ContextMenu="Edit"/>
+        </Element>
+        <Element Name="btn_copy" Class="Button" Text="Copy" CssClass="button_gray_m" Hidden="Y" Description="copy record (Ctrl+C)">
+            <EventHandler Name="btn_copy_onclick" Event="onclick" EventLogMsg="" Function="CopyRecord()" RedirectPage="form=ser.prs.presence.form.RlsPresentityCopyForm&amp;fld:Id={@:Elem[fld_Id].Value}" ShortcutKey="Ctrl+C" ContextMenu="Copy"/>
+        </Element>
+        <Element Name="btn_delete" Class="Button" Text="Delete" CssClass="button_gray_m">
+            <EventHandler Name="del_onclick" Event="onclick" EventLogMsg="" Function="DeleteRecord()" ShortcutKey="Ctrl+Delete" ContextMenu="Delete"/>
+        </Element>
+        <Element Name="btn_excel" Class="Button" Text="Export" CssClass="button_gray_m">
+            <EventHandler Name="exc_onclick" Event="onclick" EventLogMsg="" Function="CallService(excelService,renderCSV)" FunctionType="Popup" ShortcutKey="Ctrl+Shift+X" ContextMenu="Export"/>
+        </Element>
+        <Element Name="btn_search" Class="Button" Text="Search" CssClass="button_gray_m" Description="Search record">
+            <EventHandler Name="btn_search_onclick" Event="onclick" EventLogMsg="" Function="SwitchForm(ser.prs.presence.form.RlsPresentitySearchForm)" ShortcutKey="Ctrl+Shift+S" ContextMenu="Search"/>
+        </Element>
+    </ActionPanel> 
+    <NavPanel>
+  		<Element Name="page_selector" Class="PageSelector" Text="{@:m_CurrentPage}" Label="Go to Page" CssClass="input_select" cssFocusClass="input_select_focus">
+            <EventHandler Name="btn_page_selector_onchange" Event="onchange" Function="GotoSelectedPage(page_selector)"/>
+        </Element>
+        <Element Name="pagesize_selector" Class="PagesizeSelector" Text="{@:m_Range}" Label="Show Rows" CssClass="input_select" cssFocusClass="input_select_focus">
+            <EventHandler Name="btn_pagesize_selector_onchange" Event="onchange" Function="SetPageSize(pagesize_selector)"/>
+        </Element>      
+        <Element Name="btn_first" Class="Button" Enabled="{(@:m_CurrentPage == 1)?'N':'Y'}" Text="" CssClass="button_gray_navi {(@:m_CurrentPage == 1)?'first_gray':'first'}">
+            <EventHandler Name="first_onclick" Event="onclick" Function="GotoPage(1)"/>
+        </Element>
+        <Element Name="btn_prev" Class="Button" Enabled="{(@:m_CurrentPage == 1)?'N':'Y'}" Text="" CssClass="button_gray_navi {(@:m_CurrentPage == 1)?'prev_gray':'prev'}">
+            <EventHandler Name="prev_onclick" Event="onclick" Function="GotoPage({@:m_CurrentPage - 1})" ShortcutKey="Ctrl+Shift+Left"/>
+        </Element>
+        <Element Name="txt_page" Class="LabelText" Text="{'@:m_CurrentPage of @:m_TotalPages '}">
+        </Element>
+        <Element Name="btn_next" Class="Button" Enabled="{(@:m_CurrentPage == @:m_TotalPages )?'N':'Y'}" Text="" CssClass="button_gray_navi {(@:m_CurrentPage == @:m_TotalPages)?'next_gray':'next'}">
+            <EventHandler Name="next_onclick" Event="onclick" Function="GotoPage({@:m_CurrentPage + 1})" ShortcutKey="Ctrl+Shift+Right"/>
+        </Element>
+        <Element Name="btn_last" Class="Button" Enabled="{(@:m_CurrentPage == @:m_TotalPages )?'N':'Y'}" Text="" CssClass="button_gray_navi {(@:m_CurrentPage == @:m_TotalPages)?'last_gray':'last'}">
+            <EventHandler Name="last_onclick" Event="onclick" Function="GotoPage({@:m_TotalPages})"/>
+        </Element>
+    </NavPanel> 
+    <SearchPanel>
+			<Element Name="qry_rlsubs_did" Class="AutoSuggest" SelectFrom="ser.prs.presence.do.RlsPresentityDO[rlsubs_did],[rlsubs_did] like '%{@:Elem[qry_rlsubs_did].Value}%' GROUP BY [rlsubs_did]" FuzzySearch="Y" FieldName="rlsubs_did" Label="" cssFocusClass="input_text_search_focus" CssClass="input_text_search"/>
+        <Element Name="btn_dosearch" Class="Button" text="Go" CssClass="button_gray">
+            <EventHandler Name="search_onclick" Event="onclick" Function="RunSearch()" ShortcutKey="Enter"/>
+        </Element>	
+    </SearchPanel>
+</EasyForm>
diff -ruN ./a/siremis/modules/ser/prs/presence/form/RlsPresentityNewForm.xml ./b/siremis/modules/ser/prs/presence/form/RlsPresentityNewForm.xml
--- ./a/siremis/modules/ser/prs/presence/form/RlsPresentityNewForm.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/form/RlsPresentityNewForm.xml	2011-08-01 15:19:24.000000000 +0100
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EasyForm Name="RlsPresentityNewForm" Class="EasyForm" FormType="New" jsClass="jbForm" Title="New RLS Presentity" Description="" BizDataObj="ser.prs.presence.do.RlsPresentityDO" TemplateEngine="Smarty" TemplateFile="detail.tpl" EventName="" MessageFile="">
+    <DataPanel>
+        <Element Name="fld_rlsubs_did" Class="InputText" FieldName="rlsubs_did" Label="Rlsubs did"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_resource_uri" Class="InputText" FieldName="resource_uri" Label="Resource URI"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_content_type" Class="InputText" FieldName="content_type" Label="Content Type"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_presence_state" Class="Textarea" FieldName="presence_state" Label="Presence State" AllowURLParam="N" CssClass="input_textarea" CssErrorClass="input_textarea_error" CssFocusClass="input_textarea_focus"/>
+		<Element Name="fld_expires" Class="InputDatetime" FieldName="expires" Label="Expires" DefaultValue="1970-01-01 00:00:00" Sortable="Y" AllowURLParam="N" Translatable="N" OnEventLog="N"  CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_updated" Class="InputDatetime" FieldName="updated" Label="Updated" DefaultValue="1970-01-01 00:00:00" Sortable="Y" AllowURLParam="N" Translatable="N" OnEventLog="N"  CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_auth_state" Class="InputText" FieldName="auth_state" Label="Auth State"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_reason" Class="InputText" FieldName="reason" Label="Reason"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        </DataPanel>
+    <ActionPanel>
+        <Element Name="btn_save" Class="Button" Text="Save" CssClass="button_gray_m">
+            <EventHandler Name="save_onclick" EventLogMsg="" Event="onclick" Function="InsertRecord()" RedirectPage="form=ser.prs.presence.form.RlsPresentityDetailForm&amp;fld:Id={@ser.prs.presence.do.RlsPresentityDO:Field[Id].Value}"  ShortcutKey="Ctrl+Enter" ContextMenu="Save" />
+        </Element>
+        <Element Name="btn_cancel" Class="Button" Text="Cancel" CssClass="button_gray_m">
+            <EventHandler Name="cancel_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsPresentityListForm)"  ShortcutKey="Escape" ContextMenu="Cancel"/>
+        </Element>
+    </ActionPanel> 
+    <NavPanel>
+    </NavPanel> 
+    <SearchPanel>
+    </SearchPanel>
+</EasyForm>
diff -ruN ./a/siremis/modules/ser/prs/presence/form/RlsPresentitySearchForm.xml ./b/siremis/modules/ser/prs/presence/form/RlsPresentitySearchForm.xml
--- ./a/siremis/modules/ser/prs/presence/form/RlsPresentitySearchForm.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/form/RlsPresentitySearchForm.xml	2011-08-01 15:19:25.000000000 +0100
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EasyForm Name="RlsPresentitySearchForm" Class="ser.common.form.EasySearchForm" FormType="Search" jsClass="jbForm" Title="Search RLS Presentity" Description="" BizDataObj="ser.prs.presence.do.RlsPresentityDO" TemplateEngine="Smarty" TemplateFile="detail.tpl" EventName="" MessageFile="">
+    <DataPanel>
+        <Element Name="fld_rlsubs_did" Class="InputText" FieldName="rlsubs_did" Label="Rlsubs did"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_resource_uri" Class="InputText" FieldName="resource_uri" Label="Resource URI"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_content_type" Class="InputText" FieldName="content_type" Label="Content Type"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_presence_state" Class="Textarea" FieldName="presence_state" Label="Presence State" AllowURLParam="N" CssClass="input_textarea" CssErrorClass="input_textarea_error" CssFocusClass="input_textarea_focus"/>
+		<Element Name="fld_expires" Class="InputDatetime" FieldName="expires" Label="Expires" Sortable="Y" AllowURLParam="N" Translatable="N" OnEventLog="N"  CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_updated" Class="InputDatetime" FieldName="updated" Label="Updated" Sortable="Y" AllowURLParam="N" Translatable="N" OnEventLog="N"  CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_auth_state" Class="InputText" FieldName="auth_state" Label="Auth State"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_reason" Class="InputText" FieldName="reason" Label="Reason"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        </DataPanel>
+    <ActionPanel>
+        <Element Name="btn_search" Class="Button" Text="Search" CssClass="button_gray_m">
+			<EventHandler Name="search_onclick" EventLogMsg="" Event="onclick" Function="SwitchSearchForm(ser.prs.presence.form.RlsPresentityListForm)" RedirectPage=""  ShortcutKey="Ctrl+Enter" ContextMenu="Save" />
+        </Element>
+        <Element Name="btn_cancel" Class="Button" Text="Cancel" CssClass="button_gray_m">
+            <EventHandler Name="cancel_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsPresentityListForm)"  ShortcutKey="Escape" ContextMenu="Cancel"/>
+        </Element>
+    </ActionPanel> 
+    <NavPanel>
+    </NavPanel> 
+    <SearchPanel>
+    </SearchPanel>
+</EasyForm>
diff -ruN ./a/siremis/modules/ser/prs/presence/form/RlsWatchersCopyForm.xml ./b/siremis/modules/ser/prs/presence/form/RlsWatchersCopyForm.xml
--- ./a/siremis/modules/ser/prs/presence/form/RlsWatchersCopyForm.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/form/RlsWatchersCopyForm.xml	2011-08-01 15:19:25.000000000 +0100
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EasyForm Name="RlsWatchersCopyForm" Class="EasyForm" FormType="Edit" jsClass="jbForm" Title="Copy RLS Watchers" Description="" BizDataObj="ser.prs.presence.do.RlsWatchersDO" TemplateEngine="Smarty" TemplateFile="detail.tpl" EventName="" MessageFile="">
+    <DataPanel>
+        <Element Name="fld_Id" Class="Hidden" FieldName="Id" Label="Id" AllowURLParam="Y"/>	
+		<Element Name="fld_presentity_uri" Class="InputText" FieldName="presentity_uri" Label="Presentity Uri"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_watcher_username" Class="InputText" FieldName="watcher_username" Label="Watcher Username"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_watcher_domain" Class="InputText" FieldName="watcher_domain" Label="Watcher Domain"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_to_user" Class="InputText" FieldName="to_user" Label="To User"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_to_domain" Class="InputText" FieldName="to_domain" Label="To Domain"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_event" Class="InputText" FieldName="event" Label="Event"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_event_id" Class="InputText" FieldName="event_id" Label="Event Id"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_to_tag" Class="InputText" FieldName="to_tag" Label="To Tag"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_from_tag" Class="InputText" FieldName="from_tag" Label="From Tag"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_callid" Class="InputText" FieldName="callid" Label="Callid"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_local_cseq" Class="InputText" FieldName="local_cseq" Label="Local Cseq"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_remote_cseq" Class="InputText" FieldName="remote_cseq" Label="Remote Cseq"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_contact" Class="InputText" FieldName="contact" Label="Contact"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_record_route" Class="Textarea" FieldName="record_route" Label="Record Route" AllowURLParam="N" CssClass="input_textarea" CssErrorClass="input_textarea_error" CssFocusClass="input_textarea_focus"/>
+		<Element Name="fld_expires" Class="InputDatetime" FieldName="expires" Label="Expires" DefaultValue="1970-01-01 00:00:00" Sortable="Y" AllowURLParam="N" Translatable="N" OnEventLog="N"  CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_status" Class="InputText" FieldName="status" Label="Status"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_reason" Class="InputText" FieldName="reason" Label="Reason"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_version" Class="InputText" FieldName="version" Label="Version"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_socket_info" Class="InputText" FieldName="socket_info" Label="Socket Info"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_local_contact" Class="InputText" FieldName="local_contact" Label="Local Contact"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+    </DataPanel>
+    <ActionPanel>
+        <Element Name="btn_save" Class="Button" Text="Save" CssClass="button_gray_m">
+            <EventHandler Name="save_onclick" EventLogMsg="" Event="onclick" Function="InsertRecord()" RedirectPage="form=ser.prs.presence.form.RlsWatchersDetailForm&amp;fld:Id={@ser.prs.presence.do.RlsWatchersDO:Field[Id].Value}"  ShortcutKey="Ctrl+Enter" ContextMenu="Save" />
+        </Element>
+        <Element Name="btn_cancel" Class="Button" Text="Cancel" CssClass="button_gray_m">
+            <EventHandler Name="cancel_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsWatchersListForm)"  ShortcutKey="Escape" ContextMenu="Cancel"/>
+        </Element>
+    </ActionPanel> 
+    <NavPanel>
+    </NavPanel> 
+    <SearchPanel>
+    </SearchPanel>
+</EasyForm>
diff -ruN ./a/siremis/modules/ser/prs/presence/form/RlsWatchersDetailForm.xml ./b/siremis/modules/ser/prs/presence/form/RlsWatchersDetailForm.xml
--- ./a/siremis/modules/ser/prs/presence/form/RlsWatchersDetailForm.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/form/RlsWatchersDetailForm.xml	2011-08-02 10:48:21.000000000 +0100
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EasyForm Name="RlsWatchersDetailForm" Class="EasyForm" FormType="" jsClass="jbForm" Title="RLS Watchers Detail" Description="" BizDataObj="ser.prs.presence.do.RlsWatchersDO" TemplateEngine="Smarty" TemplateFile="detail_elementset.tpl" EventName="" MessageFile="">
+    <DataPanel>
+		<Element Name="fld_Id" ElementSet="General" Hidden="Y" Class="LabelText" FieldName="Id" Label="Id" AllowURLParam="Y"/>
+       	<Element Name="fld_presentity_uri" ElementSet="General" Class="LabelText" FieldName="presentity_uri" Label="Presentity Uri" AllowURLParam="N"/>
+       	<Element Name="fld_watcher_username" ElementSet="General" Class="LabelText" FieldName="watcher_username" Label="Watcher Username" AllowURLParam="N"/>
+       	<Element Name="fld_watcher_domain" ElementSet="General" Class="LabelText" FieldName="watcher_domain" Label="Watcher Domain" AllowURLParam="N"/>
+       	<Element Name="fld_to_user" ElementSet="General" Class="LabelText" FieldName="to_user" Label="To User" AllowURLParam="N"/>
+       	<Element Name="fld_to_domain" ElementSet="General" Class="LabelText" FieldName="to_domain" Label="To Domain" AllowURLParam="N"/>
+       	<Element Name="fld_event" ElementSet="General" Class="LabelText" FieldName="event" Label="Event" AllowURLParam="N"/>
+       	<Element Name="fld_event_id" ElementSet="General" Class="LabelText" FieldName="event_id" Label="Event Id" AllowURLParam="N"/>
+       	<Element Name="fld_to_tag" ElementSet="General" Class="LabelText" FieldName="to_tag" Label="To Tag" AllowURLParam="N"/>
+       	<Element Name="fld_from_tag" ElementSet="General" Class="LabelText" FieldName="from_tag" Label="From Tag" AllowURLParam="N"/>
+       	<Element Name="fld_callid" ElementSet="General" Class="LabelText" FieldName="callid" Label="Callid" AllowURLParam="N"/>
+       	<Element Name="fld_local_cseq" ElementSet="General" Class="LabelText" FieldName="local_cseq" Label="Local Cseq" AllowURLParam="N"/>
+       	<Element Name="fld_remote_cseq" ElementSet="General" Class="LabelText" FieldName="remote_cseq" Label="Remote Cseq" AllowURLParam="N"/>
+       	<Element Name="fld_contact" ElementSet="General" Class="LabelText" FieldName="contact" Label="Contact" AllowURLParam="N"/>
+       	<Element Name="fld_record_route_detail" ElementSet="General" Class="LabelText" FieldName="record_route_detail" Label="Record Route" AllowURLParam="N"/>
+       	<Element Name="fld_expires" ElementSet="General" Class="LabelText" FieldName="expires" Label="Expires" AllowURLParam="N"/>
+       	<Element Name="fld_status" ElementSet="General" Class="LabelText" FieldName="status" Label="Status" AllowURLParam="N"/>
+       	<Element Name="fld_reason" ElementSet="General" Class="LabelText" FieldName="reason" Label="Reason" AllowURLParam="N"/>
+       	<Element Name="fld_version" ElementSet="General" Class="LabelText" FieldName="version" Label="Version" AllowURLParam="N"/>
+       	<Element Name="fld_socket_info" ElementSet="General" Class="LabelText" FieldName="socket_info" Label="Socket Info" AllowURLParam="N"/>
+       	<Element Name="fld_local_contact" ElementSet="General" Class="LabelText" FieldName="local_contact" Label="Local Contact" AllowURLParam="N"/>
+    </DataPanel>
+    <ActionPanel>       
+        <Element Name="btn_new" Class="Button" Text="Add" CssClass="button_gray_add" Description="new record (Insert)" Hidden="Y">
+			<EventHandler Name="btn_new_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsWatchersNewForm)"  ShortcutKey="Insert" ContextMenu="New" />
+        </Element>          
+        <Element Name="btn_edit" Class="Button" Text="Edit" CssClass="button_gray_m" Description="edit record (Ctrl+E)" Hidden="Y">
+			<EventHandler Name="btn_new_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsWatchersEditForm,{@:Elem[fld_Id].Value})"  ShortcutKey="Ctrl+E" ContextMenu="Edit" />
+        </Element>
+		<Element Name="btn_copy" Class="Button" Text="Copy" CssClass="button_gray_m" Description="copy record (Ctrl+C)" Hidden="Y">
+            <EventHandler Name="onclick" Event="onclick" EventLogMsg="" Function="CopyRecord({@:Elem[fld_Id].Value})" RedirectPage="form=ser.prs.presence.form.RlsWatchersCopyForm&amp;fld:Id={@:Elem[fld_Id].Value}" ShortcutKey="Ctrl+C" ContextMenu="Copy"/>
+        </Element> 
+        <Element Name="btn_delete" Class="Button" Text="Delete" CssClass="button_gray_m" Description="delete record (Delete)">
+            <EventHandler Name="del_onclick" Event="onclick" EventLogMsg="" Function="DeleteRecord({@:Elem[fld_Id].Value})"  RedirectPage="form=ser.prs.presence.form.RlsWatchersListForm" ShortcutKey="Ctrl+Delete" ContextMenu="Delete" />
+        </Element>
+        <Element Name="btn_cancel" Class="Button" Text="Back" CssClass="button_gray_m">
+            <EventHandler Name="btn_cancel_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsWatchersListForm)"  ShortcutKey="Escape" ContextMenu="Cancel" />
+        </Element>         
+    </ActionPanel> 
+    <NavPanel>
+    </NavPanel> 
+    <SearchPanel>
+    </SearchPanel>
+</EasyForm>
diff -ruN ./a/siremis/modules/ser/prs/presence/form/RlsWatchersEditForm.xml ./b/siremis/modules/ser/prs/presence/form/RlsWatchersEditForm.xml
--- ./a/siremis/modules/ser/prs/presence/form/RlsWatchersEditForm.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/form/RlsWatchersEditForm.xml	2011-08-01 15:19:27.000000000 +0100
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EasyForm Name="RlsWatchersEditForm" Class="EasyForm" FormType="Edit" jsClass="jbForm" Title="Edit RLS Watchers" Description="" BizDataObj="ser.prs.presence.do.RlsWatchersDO" DefaultForm="Y" TemplateEngine="Smarty" TemplateFile="detail.tpl" EventName="" MessageFile="">
+    <DataPanel>
+		<Element Name="fld_Id" Class="Hidden" FieldName="Id" Label="Id" AllowURLParam="Y" Translatable="N" OnEventLog="N" CssClass="input" CssErrorClass="input_error"/>
+		<Element Name="fld_presentity_uri" Class="InputText" FieldName="presentity_uri" Label="Presentity Uri"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_watcher_username" Class="InputText" FieldName="watcher_username" Label="Watcher Username"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_watcher_domain" Class="InputText" FieldName="watcher_domain" Label="Watcher Domain"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_to_user" Class="InputText" FieldName="to_user" Label="To User"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_to_domain" Class="InputText" FieldName="to_domain" Label="To Domain"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_event" Class="InputText" FieldName="event" Label="Event"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_event_id" Class="InputText" FieldName="event_id" Label="Event Id"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_to_tag" Class="InputText" FieldName="to_tag" Label="To Tag"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_from_tag" Class="InputText" FieldName="from_tag" Label="From Tag"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_callid" Class="InputText" FieldName="callid" Label="Callid"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_local_cseq" Class="InputText" FieldName="local_cseq" Label="Local Cseq"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_remote_cseq" Class="InputText" FieldName="remote_cseq" Label="Remote Cseq"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_contact" Class="InputText" FieldName="contact" Label="Contact"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_record_route" Class="Textarea" FieldName="record_route" Label="Record Route" AllowURLParam="N" CssClass="input_textarea" CssErrorClass="input_textarea_error" CssFocusClass="input_textarea_focus"/>
+		<Element Name="fld_expires" Class="InputDatetime" FieldName="expires" Label="Expires" DefaultValue="1970-01-01 00:00:00" Sortable="Y" AllowURLParam="N" Translatable="N" OnEventLog="N"  CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_status" Class="InputText" FieldName="status" Label="Status"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_reason" Class="InputText" FieldName="reason" Label="Reason"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_version" Class="InputText" FieldName="version" Label="Version"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_socket_info" Class="InputText" FieldName="socket_info" Label="Socket Info"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_local_contact" Class="InputText" FieldName="local_contact" Label="Local Contact"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+    </DataPanel>
+    <ActionPanel>
+        <Element Name="btn_save" Class="Button" Text="Save" CssClass="button_gray_m">
+            <EventHandler Name="save_onclick" Event="onclick" EventLogMsg=""  Function="UpdateRecord()" RedirectPage="form=ser.prs.presence.form.RlsWatchersDetailForm&amp;fld:Id={@ser.prs.presence.do.RlsWatchersDO:Field[Id].Value}" ShortcutKey="Ctrl+Enter" ContextMenu="Save" />
+        </Element>
+        <Element Name="btn_cancel" Class="Button" Text="Cancel" CssClass="button_gray_m">
+            <EventHandler Name="btn_cancel_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsWatchersListForm)"  ShortcutKey="Escape" ContextMenu="Cancel" />
+        </Element>
+    </ActionPanel> 
+    <NavPanel>
+    </NavPanel> 
+    <SearchPanel>
+    </SearchPanel>
+</EasyForm>
diff -ruN ./a/siremis/modules/ser/prs/presence/form/RlsWatchersListForm.xml ./b/siremis/modules/ser/prs/presence/form/RlsWatchersListForm.xml
--- ./a/siremis/modules/ser/prs/presence/form/RlsWatchersListForm.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/form/RlsWatchersListForm.xml	2011-08-05 12:17:07.000000000 +0100
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EasyForm Name="RlsWatchersListForm" Class="EasyForm" FormType="List" jsClass="jbForm" Title="RLS Watchers Management" Description="" BizDataObj="ser.prs.presence.do.RlsWatchersDO" PageSize="10" DefaultForm="Y" TemplateEngine="Smarty" TemplateFile="grid.tpl" EventName="" MessageFile="">
+    <DataPanel>
+        <Element Name="row_selections" Class="RowCheckbox" Label="" FieldName="Id"/>
+        <Element Name="fld_Id" Class="ColumnText" FieldName="Id" Label="Id" Sortable="Y" AllowURLParam="N" Link="javascript:">         
+         	<EventHandler Name="fld_Id_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsWatchersDetailForm,{@:Elem[fld_Id].Value})"/>
+        </Element>
+                <Element Name="fld_presentity_uri" Class="ColumnText" FieldName="presentity_uri" Label="Presentity Uri" Sortable="Y" Link="javascript:">
+         		<EventHandler Name="fld_presentity_uri_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsWatchersDetailForm,{@:Elem[fld_Id].Value})"/>
+        </Element>
+                <Element Name="fld_watcher_username" Class="ColumnText" FieldName="watcher_username" Label="Watcher Username" Sortable="Y"/>
+                <Element Name="fld_watcher_domain" Class="ColumnText" FieldName="watcher_domain" Label="Watcher Domain" Sortable="Y"/>
+                <Element Name="fld_to_user" Class="ColumnText" FieldName="to_user" Label="To User" Sortable="Y"/>
+                <Element Name="fld_to_domain" Class="ColumnText" FieldName="to_domain" Label="To Domain" Sortable="Y"/>
+                <Element Name="fld_event" Class="ColumnText" FieldName="event" Label="Event" DefaultValue="presence" Sortable="Y"/>
+                <Element Name="fld_event_id" Class="ColumnText" FieldName="event_id" Label="Event Id" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_to_tag" Class="ColumnText" FieldName="to_tag" Label="To Tag" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_from_tag" Class="ColumnText" FieldName="from_tag" Label="From Tag" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_callid" Class="ColumnText" FieldName="callid" Label="Callid" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_local_cseq" Class="ColumnText" FieldName="local_cseq" Label="Local Cseq" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_remote_cseq" Class="ColumnText" FieldName="remote_cseq" Label="Remote Cseq" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_contact" Class="ColumnText" FieldName="contact" Label="Contact" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_record_route" Class="ColumnText" FieldName="record_route" Label="Record Route" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_expires" Class="ColumnText" FieldName="expires" Label="Expires" Sortable="Y"/>
+                <Element Name="fld_status" Class="ColumnText" FieldName="status" Label="Status" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_reason" Class="ColumnText" FieldName="reason" Label="Reason" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_version" Class="ColumnText" FieldName="version" Label="Version" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_socket_info" Class="ColumnText" FieldName="socket_info" Label="Socket Info" Sortable="Y" Hidden="Y"/>
+                <Element Name="fld_local_contact" Class="ColumnText" FieldName="local_contact" Label="Local Contact" Sortable="Y" Hidden="Y"/>
+    </DataPanel>
+    <ActionPanel>
+	    <Element Name="lnk_new" Class="Button" Text="Add" CssClass="button_gray_add" Hidden="Y" Description="new record (Insert)">
+            <EventHandler Name="lnk_new_onclick" Event="onclick" EventLogMsg="" Function="SwitchForm(ser.prs.presence.form.RlsWatchersNewForm)" ShortcutKey="Insert" ContextMenu="New"/>
+        </Element>
+        <Element Name="btn_edit" Class="Button" Text="Edit" CssClass="button_gray_m" Hidden="Y" Description="edit record (Ctrl+E)">
+            <EventHandler Name="btn_edit_onclick" Event="onclick" EventLogMsg="" Function="EditRecord()" RedirectPage="form=ser.prs.presence.form.RlsWatchersEditForm&amp;fld:Id={@:Elem[fld_Id].Value}" ShortcutKey="Ctrl+E" ContextMenu="Edit"/>
+        </Element>
+        <Element Name="btn_copy" Class="Button" Text="Copy" CssClass="button_gray_m" Hidden="Y" Description="copy record (Ctrl+C)">
+            <EventHandler Name="btn_copy_onclick" Event="onclick" EventLogMsg="" Function="CopyRecord()" RedirectPage="form=ser.prs.presence.form.RlsWatchersCopyForm&amp;fld:Id={@:Elem[fld_Id].Value}" ShortcutKey="Ctrl+C" ContextMenu="Copy"/>
+        </Element>
+        <Element Name="btn_delete" Class="Button" Text="Delete" CssClass="button_gray_m">
+            <EventHandler Name="del_onclick" Event="onclick" EventLogMsg="" Function="DeleteRecord()" ShortcutKey="Ctrl+Delete" ContextMenu="Delete"/>
+        </Element>
+        <Element Name="btn_excel" Class="Button" Text="Export" CssClass="button_gray_m">
+            <EventHandler Name="exc_onclick" Event="onclick" EventLogMsg="" Function="CallService(excelService,renderCSV)" FunctionType="Popup" ShortcutKey="Ctrl+Shift+X" ContextMenu="Export"/>
+        </Element>
+        <Element Name="btn_search" Class="Button" Text="Search" CssClass="button_gray_m" Description="Search record">
+            <EventHandler Name="btn_search_onclick" Event="onclick" EventLogMsg="" Function="SwitchForm(ser.prs.presence.form.RlsWatchersSearchForm)" ShortcutKey="Ctrl+Shift+S" ContextMenu="Search"/>
+        </Element>
+    </ActionPanel> 
+    <NavPanel>
+  		<Element Name="page_selector" Class="PageSelector" Text="{@:m_CurrentPage}" Label="Go to Page" CssClass="input_select" cssFocusClass="input_select_focus">
+            <EventHandler Name="btn_page_selector_onchange" Event="onchange" Function="GotoSelectedPage(page_selector)"/>
+        </Element>
+        <Element Name="pagesize_selector" Class="PagesizeSelector" Text="{@:m_Range}" Label="Show Rows" CssClass="input_select" cssFocusClass="input_select_focus">
+            <EventHandler Name="btn_pagesize_selector_onchange" Event="onchange" Function="SetPageSize(pagesize_selector)"/>
+        </Element>      
+        <Element Name="btn_first" Class="Button" Enabled="{(@:m_CurrentPage == 1)?'N':'Y'}" Text="" CssClass="button_gray_navi {(@:m_CurrentPage == 1)?'first_gray':'first'}">
+            <EventHandler Name="first_onclick" Event="onclick" Function="GotoPage(1)"/>
+        </Element>
+        <Element Name="btn_prev" Class="Button" Enabled="{(@:m_CurrentPage == 1)?'N':'Y'}" Text="" CssClass="button_gray_navi {(@:m_CurrentPage == 1)?'prev_gray':'prev'}">
+            <EventHandler Name="prev_onclick" Event="onclick" Function="GotoPage({@:m_CurrentPage - 1})" ShortcutKey="Ctrl+Shift+Left"/>
+        </Element>
+        <Element Name="txt_page" Class="LabelText" Text="{'@:m_CurrentPage of @:m_TotalPages '}">
+        </Element>
+        <Element Name="btn_next" Class="Button" Enabled="{(@:m_CurrentPage == @:m_TotalPages )?'N':'Y'}" Text="" CssClass="button_gray_navi {(@:m_CurrentPage == @:m_TotalPages)?'next_gray':'next'}">
+            <EventHandler Name="next_onclick" Event="onclick" Function="GotoPage({@:m_CurrentPage + 1})" ShortcutKey="Ctrl+Shift+Right"/>
+        </Element>
+        <Element Name="btn_last" Class="Button" Enabled="{(@:m_CurrentPage == @:m_TotalPages )?'N':'Y'}" Text="" CssClass="button_gray_navi {(@:m_CurrentPage == @:m_TotalPages)?'last_gray':'last'}">
+            <EventHandler Name="last_onclick" Event="onclick" Function="GotoPage({@:m_TotalPages})"/>
+        </Element>
+    </NavPanel> 
+    <SearchPanel>
+			<Element Name="qry_presentity_uri" Class="AutoSuggest" SelectFrom="ser.prs.presence.do.RlsWatchersDO[presentity_uri],[presentity_uri] like '%{@:Elem[qry_presentity_uri].Value}%' GROUP BY [presentity_uri]" FuzzySearch="Y" FieldName="presentity_uri" Label="" cssFocusClass="input_text_search_focus" CssClass="input_text_search"/>
+        <Element Name="btn_dosearch" Class="Button" text="Go" CssClass="button_gray">
+            <EventHandler Name="search_onclick" Event="onclick" Function="RunSearch()" ShortcutKey="Enter"/>
+        </Element>	
+    </SearchPanel>
+</EasyForm>
diff -ruN ./a/siremis/modules/ser/prs/presence/form/RlsWatchersNewForm.xml ./b/siremis/modules/ser/prs/presence/form/RlsWatchersNewForm.xml
--- ./a/siremis/modules/ser/prs/presence/form/RlsWatchersNewForm.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/form/RlsWatchersNewForm.xml	2011-08-01 15:19:27.000000000 +0100
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EasyForm Name="RlsWatchersNewForm" Class="EasyForm" FormType="New" jsClass="jbForm" Title="New RLS Watchers" Description="" BizDataObj="ser.prs.presence.do.RlsWatchersDO" TemplateEngine="Smarty" TemplateFile="detail.tpl" EventName="" MessageFile="">
+    <DataPanel>
+        <Element Name="fld_presentity_uri" Class="InputText" FieldName="presentity_uri" Label="Presentity Uri"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_watcher_username" Class="InputText" FieldName="watcher_username" Label="Watcher Username"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_watcher_domain" Class="InputText" FieldName="watcher_domain" Label="Watcher Domain"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_to_user" Class="InputText" FieldName="to_user" Label="To User"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_to_domain" Class="InputText" FieldName="to_domain" Label="To Domain"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_event" Class="InputText" FieldName="event" Label="Event"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_event_id" Class="InputText" FieldName="event_id" Label="Event Id"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_to_tag" Class="InputText" FieldName="to_tag" Label="To Tag"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_from_tag" Class="InputText" FieldName="from_tag" Label="From Tag"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_callid" Class="InputText" FieldName="callid" Label="Callid"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_local_cseq" Class="InputText" FieldName="local_cseq" Label="Local Cseq"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_remote_cseq" Class="InputText" FieldName="remote_cseq" Label="Remote Cseq"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_contact" Class="InputText" FieldName="contact" Label="Contact"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_record_route" Class="Textarea" FieldName="record_route" Label="Record Route" AllowURLParam="N" CssClass="input_textarea" CssErrorClass="input_textarea_error" CssFocusClass="input_textarea_focus"/>
+        <Element Name="fld_expires" Class="InputDatetime" FieldName="expires" Label="Expires" DefaultValue="1970-01-01 00:00:00" Sortable="Y" AllowURLParam="N" Translatable="N" OnEventLog="N"  CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_status" Class="InputText" FieldName="status" Label="Status"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_reason" Class="InputText" FieldName="reason" Label="Reason"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_version" Class="InputText" FieldName="version" Label="Version"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_socket_info" Class="InputText" FieldName="socket_info" Label="Socket Info"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_local_contact" Class="InputText" FieldName="local_contact" Label="Local Contact"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        </DataPanel>
+    <ActionPanel>
+        <Element Name="btn_save" Class="Button" Text="Save" CssClass="button_gray_m">
+            <EventHandler Name="save_onclick" EventLogMsg="" Event="onclick" Function="InsertRecord()" RedirectPage="form=ser.prs.presence.form.RlsWatchersDetailForm&amp;fld:Id={@ser.prs.presence.do.RlsWatchersDO:Field[Id].Value}"  ShortcutKey="Ctrl+Enter" ContextMenu="Save" />
+        </Element>
+        <Element Name="btn_cancel" Class="Button" Text="Cancel" CssClass="button_gray_m">
+            <EventHandler Name="cancel_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsWatchersListForm)"  ShortcutKey="Escape" ContextMenu="Cancel"/>
+        </Element>
+    </ActionPanel> 
+    <NavPanel>
+    </NavPanel> 
+    <SearchPanel>
+    </SearchPanel>
+</EasyForm>
diff -ruN ./a/siremis/modules/ser/prs/presence/form/RlsWatchersSearchForm.xml ./b/siremis/modules/ser/prs/presence/form/RlsWatchersSearchForm.xml
--- ./a/siremis/modules/ser/prs/presence/form/RlsWatchersSearchForm.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/prs/presence/form/RlsWatchersSearchForm.xml	2011-08-01 15:19:28.000000000 +0100
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EasyForm Name="RlsWatchersSearchForm" Class="ser.common.form.EasySearchForm" FormType="Search" jsClass="jbForm" Title="Search RLS Watchers" Description="" BizDataObj="ser.prs.presence.do.RlsWatchersDO" TemplateEngine="Smarty" TemplateFile="detail.tpl" EventName="" MessageFile="">
+    <DataPanel>
+        <Element Name="fld_presentity_uri" Class="InputText" FieldName="presentity_uri" Label="Presentity Uri"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_watcher_username" Class="InputText" FieldName="watcher_username" Label="Watcher Username"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_watcher_domain" Class="InputText" FieldName="watcher_domain" Label="Watcher Domain"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_to_user" Class="InputText" FieldName="to_user" Label="To User"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_to_domain" Class="InputText" FieldName="to_domain" Label="To Domain"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_event" Class="InputText" FieldName="event" Label="Event"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_event_id" Class="InputText" FieldName="event_id" Label="Event Id"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_to_tag" Class="InputText" FieldName="to_tag" Label="To Tag"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_from_tag" Class="InputText" FieldName="from_tag" Label="From Tag"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_callid" Class="InputText" FieldName="callid" Label="Callid"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_local_cseq" Class="InputText" FieldName="local_cseq" Label="Local Cseq"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_remote_cseq" Class="InputText" FieldName="remote_cseq" Label="Remote Cseq"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_contact" Class="InputText" FieldName="contact" Label="Contact"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+		<Element Name="fld_record_route" Class="Textarea" FieldName="record_route" Label="Record Route" AllowURLParam="N" CssClass="input_textarea" CssErrorClass="input_textarea_error" CssFocusClass="input_textarea_focus"/>
+        <Element Name="fld_expires" Class="InputDatetime" FieldName="expires" Label="Expires" Sortable="Y" AllowURLParam="N" Translatable="N" OnEventLog="N"  CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_status" Class="InputText" FieldName="status" Label="Status"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_reason" Class="InputText" FieldName="reason" Label="Reason"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_version" Class="InputText" FieldName="version" Label="Version"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_socket_info" Class="InputText" FieldName="socket_info" Label="Socket Info"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        <Element Name="fld_local_contact" Class="InputText" FieldName="local_contact" Label="Local Contact"  AllowURLParam="N" CssClass="input_text" CssErrorClass="input_text_error" CssFocusClass="input_text_focus"/>
+        </DataPanel>
+    <ActionPanel>
+        <Element Name="btn_search" Class="Button" Text="Search" CssClass="button_gray_m">
+			<EventHandler Name="search_onclick" EventLogMsg="" Event="onclick" Function="SwitchSearchForm(ser.prs.presence.form.RlsWatchersListForm)" RedirectPage=""  ShortcutKey="Ctrl+Enter" ContextMenu="Save" />
+        </Element>
+        <Element Name="btn_cancel" Class="Button" Text="Cancel" CssClass="button_gray_m">
+            <EventHandler Name="cancel_onclick" Event="onclick" Function="SwitchForm(ser.prs.presence.form.RlsWatchersListForm)"  ShortcutKey="Escape" ContextMenu="Cancel"/>
+        </Element>
+    </ActionPanel> 
+    <NavPanel>
+    </NavPanel> 
+    <SearchPanel>
+    </SearchPanel>
+</EasyForm>
diff -ruN ./a/siremis/modules/ser/view/RlsPresentityListView.xml ./b/siremis/modules/ser/view/RlsPresentityListView.xml
--- ./a/siremis/modules/ser/view/RlsPresentityListView.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/view/RlsPresentityListView.xml	2011-08-26 14:52:06.000000000 +0100
@@ -0,0 +1,13 @@
+<?xml version="1.0" standalone="no"?>
+<EasyView Name="RlsPresentityListView" Description="ser.prs.presence" Class="EasyView" Tab="" TemplateEngine="Smarty" TemplateFile="view.tpl">
+   <FormReferences>
+   		<Reference Name="ser.prs.presence.form.RlsPresentityListForm"/>
+   </FormReferences>
+   <FormReferenceLibs>
+   		<Reference Name="ser.prs.presence.form.RlsPresentityListForm"/>
+   		<Reference Name="ser.prs.presence.form.RlsPresentityEditForm"/>
+   		<Reference Name="ser.prs.presence.form.RlsPresentityCopyForm"/>
+   		<Reference Name="ser.prs.presence.form.RlsPresentityNewForm"/>
+   		<Reference Name="ser.prs.presence.form.RlsPresentityDetailForm"/>
+   </FormReferenceLibs>    
+</EasyView>
\ No newline at end of file
diff -ruN ./a/siremis/modules/ser/view/RlsWatchersListView.xml ./b/siremis/modules/ser/view/RlsWatchersListView.xml
--- ./a/siremis/modules/ser/view/RlsWatchersListView.xml	1970-01-01 01:00:00.000000000 +0100
+++ ./b/siremis/modules/ser/view/RlsWatchersListView.xml	2011-08-26 14:51:55.000000000 +0100
@@ -0,0 +1,13 @@
+<?xml version="1.0" standalone="no"?>
+<EasyView Name="RlsWatchersListView" Description="ser.prs.presence" Class="EasyView" Tab="" TemplateEngine="Smarty" TemplateFile="view.tpl">
+   <FormReferences>
+   		<Reference Name="ser.prs.presence.form.RlsWatchersListForm"/>
+   </FormReferences>
+   <FormReferenceLibs>
+   		<Reference Name="ser.prs.presence.form.RlsWatchersListForm"/>
+		<Reference Name="ser.prs.presence.form.RlsWatchersEditForm"/>
+		<Reference Name="ser.prs.presence.form.RlsWatchersCopyForm"/>
+		<Reference Name="ser.prs.presence.form.RlsWatchersNewForm"/>
+   		<Reference Name="ser.prs.presence.form.RlsWatchersDetailForm"/>
+   </FormReferenceLibs>    
+</EasyView>
\ No newline at end of file