Browse Source

kamctl: moved from tools/ to utils/

- mv tools/kamctl utils/kamctl
- updated srdb1 Makefile and test/unit/include/common with the new
  kamctl path
Andrei Pelinescu-Onciul 16 years ago
parent
commit
9df9c6e10f
100 changed files with 3 additions and 3 deletions
  1. 1 1
      lib/srdb1/schema/Makefile
  2. 2 2
      test/unit/include/common
  3. 0 0
      utils/kamctl/Makefile
  4. 0 0
      utils/kamctl/db_berkeley/kamailio/acc
  5. 0 0
      utils/kamctl/db_berkeley/kamailio/active_watchers
  6. 0 0
      utils/kamctl/db_berkeley/kamailio/address
  7. 0 0
      utils/kamctl/db_berkeley/kamailio/aliases
  8. 0 0
      utils/kamctl/db_berkeley/kamailio/carrier_name
  9. 0 0
      utils/kamctl/db_berkeley/kamailio/carrierfailureroute
  10. 0 0
      utils/kamctl/db_berkeley/kamailio/carrierroute
  11. 0 0
      utils/kamctl/db_berkeley/kamailio/cpl
  12. 0 0
      utils/kamctl/db_berkeley/kamailio/dbaliases
  13. 0 0
      utils/kamctl/db_berkeley/kamailio/dialog
  14. 0 0
      utils/kamctl/db_berkeley/kamailio/dialplan
  15. 0 0
      utils/kamctl/db_berkeley/kamailio/dispatcher
  16. 0 0
      utils/kamctl/db_berkeley/kamailio/domain
  17. 0 0
      utils/kamctl/db_berkeley/kamailio/domain_name
  18. 0 0
      utils/kamctl/db_berkeley/kamailio/domainpolicy
  19. 0 0
      utils/kamctl/db_berkeley/kamailio/globalblacklist
  20. 0 0
      utils/kamctl/db_berkeley/kamailio/grp
  21. 0 0
      utils/kamctl/db_berkeley/kamailio/gw
  22. 0 0
      utils/kamctl/db_berkeley/kamailio/htable
  23. 0 0
      utils/kamctl/db_berkeley/kamailio/imc_members
  24. 0 0
      utils/kamctl/db_berkeley/kamailio/imc_rooms
  25. 0 0
      utils/kamctl/db_berkeley/kamailio/lcr
  26. 0 0
      utils/kamctl/db_berkeley/kamailio/location
  27. 0 0
      utils/kamctl/db_berkeley/kamailio/missed_calls
  28. 0 0
      utils/kamctl/db_berkeley/kamailio/pdt
  29. 0 0
      utils/kamctl/db_berkeley/kamailio/presentity
  30. 0 0
      utils/kamctl/db_berkeley/kamailio/pua
  31. 0 0
      utils/kamctl/db_berkeley/kamailio/purplemap
  32. 0 0
      utils/kamctl/db_berkeley/kamailio/re_grp
  33. 0 0
      utils/kamctl/db_berkeley/kamailio/rls_presentity
  34. 0 0
      utils/kamctl/db_berkeley/kamailio/rls_watchers
  35. 0 0
      utils/kamctl/db_berkeley/kamailio/silo
  36. 0 0
      utils/kamctl/db_berkeley/kamailio/sip_trace
  37. 0 0
      utils/kamctl/db_berkeley/kamailio/speed_dial
  38. 0 0
      utils/kamctl/db_berkeley/kamailio/subscriber
  39. 0 0
      utils/kamctl/db_berkeley/kamailio/trusted
  40. 0 0
      utils/kamctl/db_berkeley/kamailio/uri
  41. 0 0
      utils/kamctl/db_berkeley/kamailio/userblacklist
  42. 0 0
      utils/kamctl/db_berkeley/kamailio/usr_preferences
  43. 0 0
      utils/kamctl/db_berkeley/kamailio/version
  44. 0 0
      utils/kamctl/db_berkeley/kamailio/watchers
  45. 0 0
      utils/kamctl/db_berkeley/kamailio/xcap
  46. 0 0
      utils/kamctl/dbtext/kamailio/acc
  47. 0 0
      utils/kamctl/dbtext/kamailio/active_watchers
  48. 0 0
      utils/kamctl/dbtext/kamailio/address
  49. 0 0
      utils/kamctl/dbtext/kamailio/aliases
  50. 0 0
      utils/kamctl/dbtext/kamailio/carrier_name
  51. 0 0
      utils/kamctl/dbtext/kamailio/carrierfailureroute
  52. 0 0
      utils/kamctl/dbtext/kamailio/carrierroute
  53. 0 0
      utils/kamctl/dbtext/kamailio/cpl
  54. 0 0
      utils/kamctl/dbtext/kamailio/dbaliases
  55. 0 0
      utils/kamctl/dbtext/kamailio/dialog
  56. 0 0
      utils/kamctl/dbtext/kamailio/dialplan
  57. 0 0
      utils/kamctl/dbtext/kamailio/dispatcher
  58. 0 0
      utils/kamctl/dbtext/kamailio/domain
  59. 0 0
      utils/kamctl/dbtext/kamailio/domain_name
  60. 0 0
      utils/kamctl/dbtext/kamailio/domainpolicy
  61. 0 0
      utils/kamctl/dbtext/kamailio/globalblacklist
  62. 0 0
      utils/kamctl/dbtext/kamailio/grp
  63. 0 0
      utils/kamctl/dbtext/kamailio/gw
  64. 0 0
      utils/kamctl/dbtext/kamailio/htable
  65. 0 0
      utils/kamctl/dbtext/kamailio/imc_members
  66. 0 0
      utils/kamctl/dbtext/kamailio/imc_rooms
  67. 0 0
      utils/kamctl/dbtext/kamailio/lcr
  68. 0 0
      utils/kamctl/dbtext/kamailio/location
  69. 0 0
      utils/kamctl/dbtext/kamailio/missed_calls
  70. 0 0
      utils/kamctl/dbtext/kamailio/pdt
  71. 0 0
      utils/kamctl/dbtext/kamailio/presentity
  72. 0 0
      utils/kamctl/dbtext/kamailio/pua
  73. 0 0
      utils/kamctl/dbtext/kamailio/purplemap
  74. 0 0
      utils/kamctl/dbtext/kamailio/re_grp
  75. 0 0
      utils/kamctl/dbtext/kamailio/rls_presentity
  76. 0 0
      utils/kamctl/dbtext/kamailio/rls_watchers
  77. 0 0
      utils/kamctl/dbtext/kamailio/silo
  78. 0 0
      utils/kamctl/dbtext/kamailio/sip_trace
  79. 0 0
      utils/kamctl/dbtext/kamailio/speed_dial
  80. 0 0
      utils/kamctl/dbtext/kamailio/subscriber
  81. 0 0
      utils/kamctl/dbtext/kamailio/trusted
  82. 0 0
      utils/kamctl/dbtext/kamailio/uri
  83. 0 0
      utils/kamctl/dbtext/kamailio/userblacklist
  84. 0 0
      utils/kamctl/dbtext/kamailio/usr_preferences
  85. 0 0
      utils/kamctl/dbtext/kamailio/version
  86. 0 0
      utils/kamctl/dbtext/kamailio/watchers
  87. 0 0
      utils/kamctl/dbtext/kamailio/xcap
  88. 0 0
      utils/kamctl/dbtextdb/__init__.py
  89. 0 0
      utils/kamctl/dbtextdb/dbtextdb.py
  90. 0 0
      utils/kamctl/dbtextdb/dbtextdb_test.py
  91. 0 0
      utils/kamctl/dbtextdb/tests/bad_table_auto_dupe
  92. 0 0
      utils/kamctl/dbtextdb/tests/bad_table_int
  93. 0 0
      utils/kamctl/dbtextdb/tests/bad_table_long_row
  94. 0 0
      utils/kamctl/dbtextdb/tests/bad_table_null
  95. 0 0
      utils/kamctl/dbtextdb/tests/bad_table_short_row
  96. 0 0
      utils/kamctl/dbtextdb/tests/bad_table_wrong_type
  97. 0 0
      utils/kamctl/dbtextdb/tests/subscriber
  98. 0 0
      utils/kamctl/dbtextdb/tests/test
  99. 0 0
      utils/kamctl/dbtextdb/tests/unsorted_table
  100. 0 0
      utils/kamctl/dbtextdb/tests/unsorted_table2

+ 1 - 1
lib/srdb1/schema/Makefile

@@ -7,7 +7,7 @@ TABLES := $(patsubst kamailio-%.xml,%,$(wildcard kamailio-*.xml))
 
 ROOT=../../../
 STYLESHEETS=$(ROOT)/doc/stylesheets/dbschema_k/xsl
-SCHEME=$(ROOT)/tools/kamctl/
+SCHEME=$(ROOT)/utils/kamctl/
 
 # Stylesheet used to generate MySQL database schema
 MYSQL_XSL = $(STYLESHEETS)/mysql.xsl

+ 2 - 2
test/unit/include/common

@@ -2,11 +2,11 @@
 DB_ALL_MOD="acc|alias_db|auth_db|avpops|dialog|dialplan|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt|userblacklist"
 # root directory relative to tests
 SR_DIR="../.."
-CTL_DIR="$SR_DIR/tools/kamctl"
+CTL_DIR="$SR_DIR/utils/kamctl"
 CTLRC="$CTL_DIR/kamctlrc"
 CTL="$CTL_DIR/kamctl"
 DBCTL="$CTL_DIR/kamdbctl"
 BIN="$SR_DIR/ser"
 KILL="killall -15 $BIN"
 # test directory relative to root
-TEST_DIR="test/unit"
+TEST_DIR="test/unit"

+ 0 - 0
tools/kamctl/Makefile → utils/kamctl/Makefile


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/acc → utils/kamctl/db_berkeley/kamailio/acc


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/active_watchers → utils/kamctl/db_berkeley/kamailio/active_watchers


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/address → utils/kamctl/db_berkeley/kamailio/address


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/aliases → utils/kamctl/db_berkeley/kamailio/aliases


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/carrier_name → utils/kamctl/db_berkeley/kamailio/carrier_name


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/carrierfailureroute → utils/kamctl/db_berkeley/kamailio/carrierfailureroute


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/carrierroute → utils/kamctl/db_berkeley/kamailio/carrierroute


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/cpl → utils/kamctl/db_berkeley/kamailio/cpl


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/dbaliases → utils/kamctl/db_berkeley/kamailio/dbaliases


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/dialog → utils/kamctl/db_berkeley/kamailio/dialog


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/dialplan → utils/kamctl/db_berkeley/kamailio/dialplan


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/dispatcher → utils/kamctl/db_berkeley/kamailio/dispatcher


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/domain → utils/kamctl/db_berkeley/kamailio/domain


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/domain_name → utils/kamctl/db_berkeley/kamailio/domain_name


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/domainpolicy → utils/kamctl/db_berkeley/kamailio/domainpolicy


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/globalblacklist → utils/kamctl/db_berkeley/kamailio/globalblacklist


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/grp → utils/kamctl/db_berkeley/kamailio/grp


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/gw → utils/kamctl/db_berkeley/kamailio/gw


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/htable → utils/kamctl/db_berkeley/kamailio/htable


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/imc_members → utils/kamctl/db_berkeley/kamailio/imc_members


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/imc_rooms → utils/kamctl/db_berkeley/kamailio/imc_rooms


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/lcr → utils/kamctl/db_berkeley/kamailio/lcr


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/location → utils/kamctl/db_berkeley/kamailio/location


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/missed_calls → utils/kamctl/db_berkeley/kamailio/missed_calls


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/pdt → utils/kamctl/db_berkeley/kamailio/pdt


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/presentity → utils/kamctl/db_berkeley/kamailio/presentity


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/pua → utils/kamctl/db_berkeley/kamailio/pua


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/purplemap → utils/kamctl/db_berkeley/kamailio/purplemap


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/re_grp → utils/kamctl/db_berkeley/kamailio/re_grp


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/rls_presentity → utils/kamctl/db_berkeley/kamailio/rls_presentity


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/rls_watchers → utils/kamctl/db_berkeley/kamailio/rls_watchers


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/silo → utils/kamctl/db_berkeley/kamailio/silo


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/sip_trace → utils/kamctl/db_berkeley/kamailio/sip_trace


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/speed_dial → utils/kamctl/db_berkeley/kamailio/speed_dial


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/subscriber → utils/kamctl/db_berkeley/kamailio/subscriber


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/trusted → utils/kamctl/db_berkeley/kamailio/trusted


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/uri → utils/kamctl/db_berkeley/kamailio/uri


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/userblacklist → utils/kamctl/db_berkeley/kamailio/userblacklist


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/usr_preferences → utils/kamctl/db_berkeley/kamailio/usr_preferences


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/version → utils/kamctl/db_berkeley/kamailio/version


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/watchers → utils/kamctl/db_berkeley/kamailio/watchers


+ 0 - 0
tools/kamctl/db_berkeley/kamailio/xcap → utils/kamctl/db_berkeley/kamailio/xcap


+ 0 - 0
tools/kamctl/dbtext/kamailio/acc → utils/kamctl/dbtext/kamailio/acc


+ 0 - 0
tools/kamctl/dbtext/kamailio/active_watchers → utils/kamctl/dbtext/kamailio/active_watchers


+ 0 - 0
tools/kamctl/dbtext/kamailio/address → utils/kamctl/dbtext/kamailio/address


+ 0 - 0
tools/kamctl/dbtext/kamailio/aliases → utils/kamctl/dbtext/kamailio/aliases


+ 0 - 0
tools/kamctl/dbtext/kamailio/carrier_name → utils/kamctl/dbtext/kamailio/carrier_name


+ 0 - 0
tools/kamctl/dbtext/kamailio/carrierfailureroute → utils/kamctl/dbtext/kamailio/carrierfailureroute


+ 0 - 0
tools/kamctl/dbtext/kamailio/carrierroute → utils/kamctl/dbtext/kamailio/carrierroute


+ 0 - 0
tools/kamctl/dbtext/kamailio/cpl → utils/kamctl/dbtext/kamailio/cpl


+ 0 - 0
tools/kamctl/dbtext/kamailio/dbaliases → utils/kamctl/dbtext/kamailio/dbaliases


+ 0 - 0
tools/kamctl/dbtext/kamailio/dialog → utils/kamctl/dbtext/kamailio/dialog


+ 0 - 0
tools/kamctl/dbtext/kamailio/dialplan → utils/kamctl/dbtext/kamailio/dialplan


+ 0 - 0
tools/kamctl/dbtext/kamailio/dispatcher → utils/kamctl/dbtext/kamailio/dispatcher


+ 0 - 0
tools/kamctl/dbtext/kamailio/domain → utils/kamctl/dbtext/kamailio/domain


+ 0 - 0
tools/kamctl/dbtext/kamailio/domain_name → utils/kamctl/dbtext/kamailio/domain_name


+ 0 - 0
tools/kamctl/dbtext/kamailio/domainpolicy → utils/kamctl/dbtext/kamailio/domainpolicy


+ 0 - 0
tools/kamctl/dbtext/kamailio/globalblacklist → utils/kamctl/dbtext/kamailio/globalblacklist


+ 0 - 0
tools/kamctl/dbtext/kamailio/grp → utils/kamctl/dbtext/kamailio/grp


+ 0 - 0
tools/kamctl/dbtext/kamailio/gw → utils/kamctl/dbtext/kamailio/gw


+ 0 - 0
tools/kamctl/dbtext/kamailio/htable → utils/kamctl/dbtext/kamailio/htable


+ 0 - 0
tools/kamctl/dbtext/kamailio/imc_members → utils/kamctl/dbtext/kamailio/imc_members


+ 0 - 0
tools/kamctl/dbtext/kamailio/imc_rooms → utils/kamctl/dbtext/kamailio/imc_rooms


+ 0 - 0
tools/kamctl/dbtext/kamailio/lcr → utils/kamctl/dbtext/kamailio/lcr


+ 0 - 0
tools/kamctl/dbtext/kamailio/location → utils/kamctl/dbtext/kamailio/location


+ 0 - 0
tools/kamctl/dbtext/kamailio/missed_calls → utils/kamctl/dbtext/kamailio/missed_calls


+ 0 - 0
tools/kamctl/dbtext/kamailio/pdt → utils/kamctl/dbtext/kamailio/pdt


+ 0 - 0
tools/kamctl/dbtext/kamailio/presentity → utils/kamctl/dbtext/kamailio/presentity


+ 0 - 0
tools/kamctl/dbtext/kamailio/pua → utils/kamctl/dbtext/kamailio/pua


+ 0 - 0
tools/kamctl/dbtext/kamailio/purplemap → utils/kamctl/dbtext/kamailio/purplemap


+ 0 - 0
tools/kamctl/dbtext/kamailio/re_grp → utils/kamctl/dbtext/kamailio/re_grp


+ 0 - 0
tools/kamctl/dbtext/kamailio/rls_presentity → utils/kamctl/dbtext/kamailio/rls_presentity


+ 0 - 0
tools/kamctl/dbtext/kamailio/rls_watchers → utils/kamctl/dbtext/kamailio/rls_watchers


+ 0 - 0
tools/kamctl/dbtext/kamailio/silo → utils/kamctl/dbtext/kamailio/silo


+ 0 - 0
tools/kamctl/dbtext/kamailio/sip_trace → utils/kamctl/dbtext/kamailio/sip_trace


+ 0 - 0
tools/kamctl/dbtext/kamailio/speed_dial → utils/kamctl/dbtext/kamailio/speed_dial


+ 0 - 0
tools/kamctl/dbtext/kamailio/subscriber → utils/kamctl/dbtext/kamailio/subscriber


+ 0 - 0
tools/kamctl/dbtext/kamailio/trusted → utils/kamctl/dbtext/kamailio/trusted


+ 0 - 0
tools/kamctl/dbtext/kamailio/uri → utils/kamctl/dbtext/kamailio/uri


+ 0 - 0
tools/kamctl/dbtext/kamailio/userblacklist → utils/kamctl/dbtext/kamailio/userblacklist


+ 0 - 0
tools/kamctl/dbtext/kamailio/usr_preferences → utils/kamctl/dbtext/kamailio/usr_preferences


+ 0 - 0
tools/kamctl/dbtext/kamailio/version → utils/kamctl/dbtext/kamailio/version


+ 0 - 0
tools/kamctl/dbtext/kamailio/watchers → utils/kamctl/dbtext/kamailio/watchers


+ 0 - 0
tools/kamctl/dbtext/kamailio/xcap → utils/kamctl/dbtext/kamailio/xcap


+ 0 - 0
tools/kamctl/dbtextdb/__init__.py → utils/kamctl/dbtextdb/__init__.py


+ 0 - 0
tools/kamctl/dbtextdb/dbtextdb.py → utils/kamctl/dbtextdb/dbtextdb.py


+ 0 - 0
tools/kamctl/dbtextdb/dbtextdb_test.py → utils/kamctl/dbtextdb/dbtextdb_test.py


+ 0 - 0
tools/kamctl/dbtextdb/tests/bad_table_auto_dupe → utils/kamctl/dbtextdb/tests/bad_table_auto_dupe


+ 0 - 0
tools/kamctl/dbtextdb/tests/bad_table_int → utils/kamctl/dbtextdb/tests/bad_table_int


+ 0 - 0
tools/kamctl/dbtextdb/tests/bad_table_long_row → utils/kamctl/dbtextdb/tests/bad_table_long_row


+ 0 - 0
tools/kamctl/dbtextdb/tests/bad_table_null → utils/kamctl/dbtextdb/tests/bad_table_null


+ 0 - 0
tools/kamctl/dbtextdb/tests/bad_table_short_row → utils/kamctl/dbtextdb/tests/bad_table_short_row


+ 0 - 0
tools/kamctl/dbtextdb/tests/bad_table_wrong_type → utils/kamctl/dbtextdb/tests/bad_table_wrong_type


+ 0 - 0
tools/kamctl/dbtextdb/tests/subscriber → utils/kamctl/dbtextdb/tests/subscriber


+ 0 - 0
tools/kamctl/dbtextdb/tests/test → utils/kamctl/dbtextdb/tests/test


+ 0 - 0
tools/kamctl/dbtextdb/tests/unsorted_table → utils/kamctl/dbtextdb/tests/unsorted_table


+ 0 - 0
tools/kamctl/dbtextdb/tests/unsorted_table2 → utils/kamctl/dbtextdb/tests/unsorted_table2


Some files were not shown because too many files changed in this diff