Fixes in paths.

diff --git a/stglibs/srvconf.lib/Makefile b/stglibs/srvconf.lib/Makefile
index aaf3e117999707230fb2c7a20cdfbe23022c2621..d3fdb2841fb713768a7d3940bd9028a939284142 100644 (file)
--- a/stglibs/srvconf.lib/Makefile
+++ b/stglibs/srvconf.lib/Makefile
@@ -8,17 +8,18 @@ STGLIBS = -lstgcommon \
           -lstgcrypto
 LIBS = -lexpat
 
           -lstgcrypto
 LIBS = -lexpat
 

-SRCS =  netunit.cpp \
-        property_parsers.cpp \
-        parser_auth_by.cpp \
-        parser_server_info.cpp \
-        parser_check_user.cpp \
-        parser_get_user.cpp \
-        parser_get_users.cpp \
-        parser_chg_user.cpp \
-        parser_send_message.cpp \
+SRCS =  parsers/property.cpp \
+        parsers/auth_by.cpp \
+        parsers/server_info.cpp \
+        parsers/check_user.cpp \
+        parsers/get_user.cpp \
+        parsers/get_users.cpp \
+        parsers/chg_user.cpp \
+        parsers/send_message.cpp \
+        netunit.cpp \

         servconf.cpp
 
         servconf.cpp
 

+

 INCS = servconf.h \
        netunit.h
 
 INCS = servconf.h \
        netunit.h
 

diff --git a/stglibs/srvconf.lib/parsers/auth_by.cpp b/stglibs/srvconf.lib/parsers/auth_by.cpp
index 34e490ca0f3b90736398c0694b89e657b8bf2c1e..99e3c0214c522e09d3a36806ab958823f5145168 100644 (file)
--- a/stglibs/srvconf.lib/parsers/auth_by.cpp
+++ b/stglibs/srvconf.lib/parsers/auth_by.cpp
@@ -18,7 +18,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#include "parser_auth_by.h"
+#include "auth_by.h"

 
 #include <cstddef>
 
 
 #include <cstddef>
 

diff --git a/stglibs/srvconf.lib/parsers/auth_by.h b/stglibs/srvconf.lib/parsers/auth_by.h
index c4757cf9699ce97392f3887f50689a1bf2c7ceea..a4bab9dd508999ba369689d8df9675fb8dcf965e 100644 (file)
--- a/stglibs/srvconf.lib/parsers/auth_by.h
+++ b/stglibs/srvconf.lib/parsers/auth_by.h
@@ -21,7 +21,7 @@
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_AUTH_BY_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_AUTH_BY_H__
 
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_AUTH_BY_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_AUTH_BY_H__
 

-#include "parser.h"
+#include "base.h"

 
 #include "stg/servconf_types.h"
 
 
 #include "stg/servconf_types.h"
 

diff --git a/stglibs/srvconf.lib/parsers/check_user.cpp b/stglibs/srvconf.lib/parsers/check_user.cpp
index 0cb37522a66947e38ddead199ae4be338c322653..8bf81e242d93d2aba6656a0706043650400c1696 100644 (file)
--- a/stglibs/srvconf.lib/parsers/check_user.cpp
+++ b/stglibs/srvconf.lib/parsers/check_user.cpp
@@ -19,7 +19,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#include "parser_check_user.h"
+#include "check_user.h"

 
 #include <cstddef>
 
 
 #include <cstddef>
 

diff --git a/stglibs/srvconf.lib/parsers/check_user.h b/stglibs/srvconf.lib/parsers/check_user.h
index 95658c3895f9682513b5a235fa9e416b4f845661..25740f02abee301f00842944d30a4e7ddda72cff 100644 (file)
--- a/stglibs/srvconf.lib/parsers/check_user.h
+++ b/stglibs/srvconf.lib/parsers/check_user.h
@@ -22,7 +22,7 @@
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_CHECK_USER_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_CHECK_USER_H__
 
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_CHECK_USER_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_CHECK_USER_H__
 

-#include "parser.h"
+#include "base.h"

 
 #include "stg/servconf_types.h"
 
 
 #include "stg/servconf_types.h"
 

diff --git a/stglibs/srvconf.lib/parsers/chg_user.cpp b/stglibs/srvconf.lib/parsers/chg_user.cpp
index b5f4eb73ccde237aa0c1b1c01811e0290763817e..a7d3592556f197de0c0967ee97d5582ee4dddcb9 100644 (file)
--- a/stglibs/srvconf.lib/parsers/chg_user.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_user.cpp
@@ -19,7 +19,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#include "parser_chg_user.h"
+#include "chg_user.h"

 
 #include <cstddef>
 
 
 #include <cstddef>
 

diff --git a/stglibs/srvconf.lib/parsers/chg_user.h b/stglibs/srvconf.lib/parsers/chg_user.h
index 63c528d018142b8d61cb5ad11d9f89bf8ba7aadb..424866bcf06354740a024aec1a3ee4a0019d16c4 100644 (file)
--- a/stglibs/srvconf.lib/parsers/chg_user.h
+++ b/stglibs/srvconf.lib/parsers/chg_user.h
@@ -22,7 +22,7 @@
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_CHG_USER_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_CHG_USER_H__
 
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_CHG_USER_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_CHG_USER_H__
 

-#include "parser.h"
+#include "base.h"

 
 #include "stg/servconf_types.h"
 
 
 #include "stg/servconf_types.h"
 

diff --git a/stglibs/srvconf.lib/parsers/get_user.cpp b/stglibs/srvconf.lib/parsers/get_user.cpp
index 2c398914bac0c40f7ad9cc843767bb9147b8ae31..71e6cba6850a1f7e1dd000825dd740611c872931 100644 (file)
--- a/stglibs/srvconf.lib/parsers/get_user.cpp
+++ b/stglibs/srvconf.lib/parsers/get_user.cpp
@@ -19,7 +19,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#include "parser_get_user.h"
+#include "get_user.h"

 
 #include "stg/common.h"
 
 
 #include "stg/common.h"
 

diff --git a/stglibs/srvconf.lib/parsers/get_user.h b/stglibs/srvconf.lib/parsers/get_user.h
index c8c371d767db8cf738bf3a6bb376493a61842863..190b5784146a5cbd76cff2c2707ba4808d15715f 100644 (file)
--- a/stglibs/srvconf.lib/parsers/get_user.h
+++ b/stglibs/srvconf.lib/parsers/get_user.h
@@ -22,8 +22,8 @@
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__
 
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__
 

-#include "parser.h"
-#include "property_parsers.h"
+#include "base.h"
+#include "property.h"

 
 #include "stg/servconf_types.h"
 
 
 #include "stg/servconf_types.h"
 

diff --git a/stglibs/srvconf.lib/parsers/get_users.cpp b/stglibs/srvconf.lib/parsers/get_users.cpp
index ecc2917cb2794290918c4c4aac10ce2ef1ed8862..cf62f3579c4b531ef95722c6370f0aa02c8dc84e 100644 (file)
--- a/stglibs/srvconf.lib/parsers/get_users.cpp
+++ b/stglibs/srvconf.lib/parsers/get_users.cpp
@@ -19,7 +19,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#include "parser_get_users.h"
+#include "get_users.h"

 
 #include <cstddef>
 
 
 #include <cstddef>
 

diff --git a/stglibs/srvconf.lib/parsers/get_users.h b/stglibs/srvconf.lib/parsers/get_users.h
index ea9966eee6bdf49f9828bd3bc2a216e6cbf4a90a..ac648a270aa86c2e0ef4f091598f4fca0d645eac 100644 (file)
--- a/stglibs/srvconf.lib/parsers/get_users.h
+++ b/stglibs/srvconf.lib/parsers/get_users.h
@@ -23,8 +23,8 @@
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_GET_USERS_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_GET_USERS_H__
 
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_GET_USERS_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_GET_USERS_H__
 

-#include "parser.h"
-#include "parser_get_user.h"
+#include "base.h"
+#include "get_user.h"

 
 #include "stg/servconf_types.h"
 
 
 #include "stg/servconf_types.h"
 

diff --git a/stglibs/srvconf.lib/parsers/property.cpp b/stglibs/srvconf.lib/parsers/property.cpp
index 5d4577dc43ffd0a5b2ca0ff9ee2ab7ee5c123557..8a78fe76593a2336178db51a58892588940b542c 100644 (file)
--- a/stglibs/srvconf.lib/parsers/property.cpp
+++ b/stglibs/srvconf.lib/parsers/property.cpp
@@ -18,7 +18,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#include "property_parsers.h"
+#include "property.h"

 
 #include <strings.h>
 
 
 #include <strings.h>
 

diff --git a/stglibs/srvconf.lib/parsers/send_message.cpp b/stglibs/srvconf.lib/parsers/send_message.cpp
index 318cc8ebb5e48cdf4cb0bb4796604e2cca0f2683..c3a91789058ffcd4a9ddae2bd6b08ba37b1215c4 100644 (file)
--- a/stglibs/srvconf.lib/parsers/send_message.cpp
+++ b/stglibs/srvconf.lib/parsers/send_message.cpp
@@ -19,7 +19,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#include "parser_send_message.h"
+#include "send_message.h"

 
 #include <cstddef>
 
 
 #include <cstddef>
 

diff --git a/stglibs/srvconf.lib/parsers/send_message.h b/stglibs/srvconf.lib/parsers/send_message.h
index 27903bc0cb8b34b8507fdb44b8d1f55c6f4ff854..7e4ded2205a5e3b09e86745a74945b9bc1be9fd0 100644 (file)
--- a/stglibs/srvconf.lib/parsers/send_message.h
+++ b/stglibs/srvconf.lib/parsers/send_message.h
@@ -22,7 +22,7 @@
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_SEND_MESSAGE_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_SEND_MESSAGE_H__
 
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_SEND_MESSAGE_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_SEND_MESSAGE_H__
 

-#include "parser.h"
+#include "base.h"

 
 #include "stg/servconf_types.h"
 
 
 #include "stg/servconf_types.h"
 

diff --git a/stglibs/srvconf.lib/parsers/server_info.cpp b/stglibs/srvconf.lib/parsers/server_info.cpp
index d4c610e0aea839f9311011cb2d02160aceff2cbf..1b63785817e1dde8081ec06059c6f6aeadda218e 100644 (file)
--- a/stglibs/srvconf.lib/parsers/server_info.cpp
+++ b/stglibs/srvconf.lib/parsers/server_info.cpp
@@ -19,7 +19,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#include "parser_server_info.h"
+#include "server_info.h"

 
 #include "stg/common.h"
 
 
 #include "stg/common.h"
 

diff --git a/stglibs/srvconf.lib/parsers/server_info.h b/stglibs/srvconf.lib/parsers/server_info.h
index 9ac23ee8437d189bd8c68538f696fd2d52f85691..7bcbbba471042e62ade5381c9673691cbc8ede26 100644 (file)
--- a/stglibs/srvconf.lib/parsers/server_info.h
+++ b/stglibs/srvconf.lib/parsers/server_info.h
@@ -22,8 +22,8 @@
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_SERVER_INFO_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_SERVER_INFO_H__
 
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_SERVER_INFO_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_SERVER_INFO_H__
 

-#include "parser.h"
-#include "property_parsers.h"
+#include "base.h"
+#include "property.h"

 
 #include "stg/servconf_types.h"
 
 
 #include "stg/servconf_types.h"
 

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 3684dd541f82f82c8e8eb4ad701c6620942e196a..325ee5f2a106b43870db21c62c346ae5cad11b05 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -21,13 +21,14 @@
 #include "stg/servconf.h"
 
 #include "netunit.h"
 #include "stg/servconf.h"
 
 #include "netunit.h"

-#include "parser_auth_by.h"
-#include "parser_server_info.h"
-#include "parser_check_user.h"
-#include "parser_get_users.h"
-#include "parser_get_user.h"
-#include "parser_chg_user.h"
-#include "parser_send_message.h"
+#include "parsers/auth_by.h"
+#include "parsers/server_info.h"
+#include "parsers/check_user.h"
+#include "parsers/get_users.h"
+#include "parsers/get_user.h"
+#include "parsers/chg_user.h"
+#include "parsers/send_message.h"
+#include "parsers/base.h"

 
 #include "stg/common.h"
 
 
 #include "stg/common.h"