Преглед изворни кода

- remove SERWEB stuff from database scheme and tables

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3787 689a6050-402a-0410-94f2-e92a70836424
Henning Westerholt пре 17 година
родитељ
комит
b20e950073

+ 1 - 1
lib/srdb1/schema/Makefile

@@ -5,7 +5,7 @@
 # OpenSER database descriptions for modules
 TABLES = standard acc imc lcr siptrace domainpolicy cpl domain group \
 	dialog permissions registrar usrloc msilo alias_db uri_db speeddial \
-	avpops auth_db pdt dispatcher presence rls serweb extensions carrierroute \
+	avpops auth_db pdt dispatcher presence rls extensions carrierroute \
 	userblacklist
 
 ROOT=../..

+ 0 - 19
lib/srdb1/schema/openser-serweb.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE database PUBLIC "-//openser.org//DTD DBSchema V1.1//EN"
-  "http://openser.org/pub/openser/dbschema/dtd/1.1/dbschema.dtd" [
-
-  <!ENTITY % entities SYSTEM "entities.xml">
-  %entities;
-
-]>
-
-<database xmlns:xi="http://www.w3.org/2001/XInclude">
-    <name>SERWeb</name>
-    <xi:include href="sw_active_sessions.xml"/>
-    <xi:include href="sw_pending.xml"/>
-    <xi:include href="sw_phonebook.xml"/>
-    <xi:include href="sw_usr_preferences_type.xml"/>
-    <xi:include href="sw_server_monitoring.xml"/>
-    <xi:include href="sw_server_monitoring_agg.xml"/>
-    <xi:include href="sw_admin_privileges.xml"/>
-</database>

+ 0 - 60
lib/srdb1/schema/sw_active_sessions.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//openser.org//DTD DBSchema V1.1//EN" 
-  "http://openser.org/pub/openser/dbschema/dtd/1.1/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table id="active_sessions" xmlns:db="http://docbook.org/ns/docbook">
-    <name>active_sessions</name>
-    <version>1</version>
-    <type db="mysql">&MYSQL_TABLE_TYPE;</type>
-    <description>
-        <db:para>This table is used by SERWeb to maintain active sessions. It is not used by OpenSER.</db:para>
-    </description>
-
-    <column id="sid">
-        <name>sid</name>
-        <type>string</type>
-        <size>32</size>
-        <default/>
-        <description>Session ID</description>
-    </column>
-
-    <column id="name">
-        <name>name</name>
-        <type>string</type>
-        <size>32</size>
-        <default/>
-        <description>Session Name</description>
-    </column>
-
-    <column>
-        <name>val</name>
-        <type>text</type>
-        <null/>
-        <description>Val</description>
-    </column>
-
-    <column id="changed">
-        <name>changed</name>
-        <type>string</type>
-        <size>14</size>
-        <default/>
-        <description>Domain corresponding to (sdomain, prefix) pair where the message must be sent.</description>
-    </column>
-
-    <index>
-        <name>sw_as_idx</name>
-        <colref linkend="name"/>
-        <colref linkend="sid"/>
-        <primary/>
-    </index>
-
-    <index>
-        <name>changed</name>
-        <colref linkend="changed"/>
-    </index>
-</table>

+ 0 - 58
lib/srdb1/schema/sw_admin_privileges.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//openser.org//DTD DBSchema V1.1//EN" 
-  "http://openser.org/pub/openser/dbschema/dtd/1.1/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table id="admin_privileges" xmlns:db="http://docbook.org/ns/docbook">
-    <name>admin_privileges</name>
-    <version>1</version>
-    <type db="mysql">&MYSQL_TABLE_TYPE;</type>
-    <description>
-        <db:para>Admin privileges table for SERWeb for multidomain ACL control.</db:para>
-    </description>
-
-    <column id="username">
-        <name>&USERCOL;</name>
-        <type>string</type>
-        <size>&user_len;</size>
-        <default/>
-        <description>Username</description>
-    </column>
-
-    <column id="domain">
-        <name>domain</name>
-        <type>string</type>
-        <size>&domain_len;</size>
-        <default/>
-        <description>Domain</description>
-    </column>
-
-    <column id="priv_name">
-        <name>priv_name</name>
-        <type>string</type>
-        <size>&user_len;</size>
-        <default/>
-        <description>priv_name</description>
-    </column>
-
-    <column id="priv_value">
-        <name>priv_value</name>
-        <type>string</type>
-        <size>&user_len;</size>
-        <default/>
-        <description>priv_value</description>
-    </column>
-
-    <index>
-        <name>sw_ap_idx</name>
-        <colref linkend="username"/>
-        <colref linkend="priv_name"/>
-        <colref linkend="priv_value"/>
-        <colref linkend="domain"/>
-        <primary/>
-    </index>
-</table>

+ 0 - 197
lib/srdb1/schema/sw_pending.xml

@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//openser.org//DTD DBSchema V1.1//EN" 
-  "http://openser.org/pub/openser/dbschema/dtd/1.1/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table id="pending" xmlns:db="http://docbook.org/ns/docbook">
-    <name>pending</name>
-    <version>6</version>
-    <type db="mysql">&MYSQL_TABLE_TYPE;</type>
-    <description>
-        <db:para>SerWEB specific table - Not used by OpenSER. It should have same structure as table subscriber and contains unconfirmed subscription requests.</db:para>
-    </description>
-    
-    <column id="id">
-        <name>id</name>
-        <type>unsigned int</type>
-        <size>&table_id_len;</size>
-        <autoincrement/>
-        <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
-        <type db="dbtext">int,auto</type>
-        <description>Unique ID</description>
-    </column>
-
-    <column id="phplib_id">
-        <name>phplib_id</name>
-        <type>string</type>
-        <size>32</size>
-        <default/>
-        <description>PHP Library ID</description>
-    </column>
-
-    <column id="username">
-        <name>&USERCOL;</name>
-        <type>string</type>
-        <size>&user_len;</size>
-        <default/>
-        <description>Username / Phone Number</description>
-    </column>
-
-    <column id="domain">
-        <name>domain</name>
-        <type>string</type>
-        <size>&domain_len;</size>
-        <default/>
-        <description>Domain name</description>
-    </column>
-
-    <column>
-        <name>password</name>
-        <type>string</type>
-        <size>25</size>
-        <default/>
-        <description>Password</description>
-    </column>
-
-    <column>
-        <name>firstname</name>
-        <type>string</type>
-        <size>25</size>
-        <default/>
-        <description>First name</description>
-    </column>
-
-    <column>
-        <name>lastname</name>
-        <type>string</type>
-        <size>45</size>
-        <default/>
-        <description>Last name</description>
-    </column>
-
-    <column>
-        <name>phone</name>
-        <type>string</type>
-        <size>15</size>
-        <default/>
-    </column>
-
-    <column>
-        <name>email_address</name>
-        <type>string</type>
-        <size>50</size>
-        <default/>
-        <description>Email Address</description>
-    </column>
-
-    <column>
-        <name>datetime_created</name>
-        <type>datetime</type>
-        <default>&DEFAULT_DATETIME;</default>
-        <description>Date / Time this record was created</description>
-    </column>
-
-    <column>
-        <name>datetime_modified</name>
-        <type>datetime</type>
-        <default>&DEFAULT_DATETIME;</default>
-        <description>Date / Time this record was modified</description>
-    </column>
-
-    <column>
-        <name>confirmation</name>
-        <type>string</type>
-        <size>&user_len;</size>
-        <default/>
-        <description>Confirmation</description>
-    </column>
-
-    <column>
-        <name>flag</name>
-        <type>string</type>
-        <size>1</size>
-        <default>o</default>
-        <description>Flag</description>
-    </column>
-
-    <column>
-        <name>sendnotification</name>
-        <type>string</type>
-        <size>50</size>
-        <default/>
-        <description>Send notification</description>
-    </column>
-
-    <column>
-        <name>greeting</name>
-        <type>string</type>
-        <size>50</size>
-        <default/>
-        <description>Greeting</description>
-    </column>
-
-    <column>
-        <name>ha1</name>
-        <type>string</type>
-        <size>&domain_len;</size>
-        <default/>
-        <description>md5(username:realm:password)</description>
-    </column>
-
-    <column>
-        <name>ha1b</name>
-        <type>string</type>
-        <size>&domain_len;</size>
-        <default/>
-        <description>md5(username@domain:realm:password)</description>
-    </column>
-
-    <column>
-        <name>allow_find</name>
-        <type>string</type>
-        <size>1</size>
-        <default>0</default>
-        <description>Allow find Flag</description>
-    </column>
-
-    <column>
-        <name>timezone</name>
-        <type>string</type>
-        <size>&domain_len;</size>
-        <null/>
-        <default><null/></default>
-        <description>Users time zone</description>
-    </column>
-
-    <column>
-        <name>rpid</name>
-        <type>string</type>
-        <size>&domain_len;</size>
-        <null/>
-        <default><null/></default>
-        <description>The SIP Remote-Party-ID header identifies the calling party and includes user, party, screen and privacy headers that specify how a call is presented and screened.</description>
-    </column>
-
-    <index>
-        <name>sw_user_id</name>
-        <colref linkend="username"/>
-        <colref linkend="domain"/>
-        <unique/>
-    </index>
-
-    <index>
-        <name>phplib_id</name>
-        <colref linkend="phplib_id"/>
-        <unique/>
-    </index>
-
-    <index>
-        <name>username_id</name>
-        <colref linkend="username"/>
-    </index>
-</table>

+ 0 - 68
lib/srdb1/schema/sw_phonebook.xml

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//openser.org//DTD DBSchema V1.1//EN" 
-  "http://openser.org/pub/openser/dbschema/dtd/1.1/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table id="phonebook" xmlns:db="http://docbook.org/ns/docbook">
-    <name>phonebook</name>
-    <version>1</version>
-    <type db="mysql">&MYSQL_TABLE_TYPE;</type>
-    <description>
-        <db:para>Users Phonebook table used from SERWeb.</db:para>
-    </description>
-
-    <column id="id">
-        <name>id</name>
-        <type>unsigned int</type>
-        <size>&table_id_len;</size>
-        <autoincrement/>
-        <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
-        <type db="dbtext">int,auto</type>
-        <description>Unique ID</description>
-    </column>
-
-    <column>
-        <name>&USERCOL;</name>
-        <type>string</type>
-        <size>&user_len;</size>
-        <default/>
-        <description>Username / Phonenumber</description>
-    </column>
-
-    <column>
-        <name>domain</name>
-        <type>string</type>
-        <size>&domain_len;</size>
-        <default/>
-        <description>Domain Name</description>
-    </column>
-
-    <column>
-        <name>fname</name>
-        <type>string</type>
-        <size>32</size>
-        <default/>
-        <description>First Nname</description>
-    </column>
-
-    <column>
-        <name>lname</name>
-        <type>string</type>
-        <size>32</size>
-        <default/>
-        <description>Last Name</description>
-    </column>
-
-    <column>
-        <name>sip_uri</name>
-        <type>string</type>
-        <size>&domain_len;</size>
-        <default/>
-        <description>SIP URI associated with this record</description>
-    </column>
-</table>

+ 0 - 63
lib/srdb1/schema/sw_server_monitoring.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//openser.org//DTD DBSchema V1.1//EN" 
-  "http://openser.org/pub/openser/dbschema/dtd/1.1/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table id="server_monitoring" xmlns:db="http://docbook.org/ns/docbook">
-    <name>server_monitoring</name>
-    <version>1</version>
-    <type db="mysql">&MYSQL_TABLE_TYPE;</type>
-    <description>
-        <db:para>Server monitoring table used from SERWeb.</db:para>
-    </description>
-
-    <column id="id">
-        <name>id</name>
-        <type>unsigned int</type>
-        <size>&table_id_len;</size>
-        <default>0</default>
-        <description>Unique ID</description>
-    </column>
-
-    <column>
-        <name>time</name>
-        <type>datetime</type>
-        <default>&DEFAULT_DATETIME;</default>
-        <description>Time</description>
-    </column>
-
-    <column id="param">
-        <name>param</name>
-        <type>string</type>
-        <size>32</size>
-        <default/>
-        <description>Param</description>
-    </column>
-
-    <column>
-        <name>value</name>
-        <type>int</type>
-        <size>10</size>
-        <default>0</default>
-        <description>Value</description>
-    </column>
-
-    <column>
-        <name>increment</name>
-        <type>int</type>
-        <size>10</size>
-        <default>0</default>
-        <description>Increment</description>
-    </column>
-
-    <index>
-        <name>sw_sm_idx</name>
-        <colref linkend="id"/>
-        <colref linkend="param"/>
-        <primary/>
-    </index>
-</table>

+ 0 - 119
lib/srdb1/schema/sw_server_monitoring_agg.xml

@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//openser.org//DTD DBSchema V1.1//EN" 
-  "http://openser.org/pub/openser/dbschema/dtd/1.1/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table id="server_monitoring_agg" xmlns:db="http://docbook.org/ns/docbook">
-    <name>server_monitoring_agg</name>
-    <version>1</version>
-    <type db="mysql">&MYSQL_TABLE_TYPE;</type>
-    <description>
-        <db:para>Server monitoring table used from SERWeb.</db:para>
-    </description>
-
-    <column id="param">
-        <name>param</name>
-        <type>string</type>
-        <size>32</size>
-        <primary/>
-        <default/>
-        <description>Param</description>
-    </column>
-
-    <column>
-        <name>s_value</name>
-        <type>int</type>
-        <size>10</size>
-        <default>0</default>
-        <description>s_value</description>
-    </column>
-
-    <column>
-        <name>s_increment</name>
-        <type>int</type>
-        <size>10</size>
-        <default>0</default>
-        <description>s_increment</description>
-    </column>
-
-    <column>
-        <name>last_aggregated_increment</name>
-        <type>int</type>
-        <size>10</size>
-        <default>0</default>
-        <description>last aggregated increment</description>
-    </column>
-
-    <column>
-       <name>av</name>
-       <type>float</type>
-       <default>0</default>
-      <description>av</description>
-    </column>
-
-    <column>
-        <name>mv</name>
-        <type>int</type>
-        <size>10</size>
-        <default>0</default>
-        <description>mv</description>
-    </column>
-
-    <column>
-        <name>ad</name>
-        <type>float</type>
-        <default>0</default>
-        <description>ad</description>
-    </column>
-
-    <column>
-        <name>lv</name>
-        <type>int</type>
-        <size>10</size>
-        <default>0</default>
-        <description>lv</description>
-    </column>
-
-    <column>
-        <name>min_val</name>
-        <type>int</type>
-        <size>10</size>
-        <default>0</default>
-        <description>minimum value</description>
-    </column>
-
-    <column>
-        <name>max_val</name>
-        <type>int</type>
-        <size>10</size>
-        <default>0</default>
-        <description>maximum value</description>
-    </column>
-
-    <column>
-        <name>min_inc</name>
-        <type>int</type>
-        <size>10</size>
-        <default>0</default>
-        <description>minimal increment</description>
-    </column>
-
-    <column>
-        <name>max_inc</name>
-        <type>int</type>
-        <size>10</size>
-        <default>0</default>
-        <description>maximal increment</description>
-    </column>
-
-    <column>
-        <name>lastupdate</name>
-        <type>datetime</type>
-        <default>&DEFAULT_DATETIME;</default>
-        <description>last update time and date</description>
-    </column>
-</table>

+ 0 - 55
lib/srdb1/schema/sw_usr_preferences_type.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//openser.org//DTD DBSchema V1.1//EN" 
-  "http://openser.org/pub/openser/dbschema/dtd/1.1/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table id="usr_preferences_types" xmlns:db="http://docbook.org/ns/docbook">
-    <name>usr_preferences_types</name>
-    <version>1</version>
-    <type db="mysql">&MYSQL_TABLE_TYPE;</type>
-    <description>
-        <db:para>User preferences table for SERWeb.</db:para>
-    </description>
-
-    <column id="att_name">
-        <name>att_name</name>
-        <type>string</type>
-        <size>32</size>
-        <primary/>
-        <default/>
-        <description>att_name</description>
-    </column>
-
-    <column>
-        <name>att_rich</name>
-        <type>string</type>
-        <size>32</size>
-        <default>string</default>
-        <description>att_rich</description>
-    </column>
-
-    <column>
-        <name>att_raw_type</name>
-        <type>int</type>
-        <default>2</default>
-        <description>att_raw</description>
-    </column>
-
-    <column>
-        <name>att_type_spec</name>
-        <type>text</type>
-        <description>att_type_spec</description>
-    </column>
-
-    <column>
-        <name>default_value</name>
-        <type>string</type>
-        <size>100</size>
-        <default/>
-        <description>Default Value</description>
-    </column>
-</table>