Restructured components.

diff --git a/base/application.h b/base/application.h
index 8b330b2701c547898e0c3b24d937a81b7c3708b0..04d388c97876b6511c4f775b79dc028e0522e7f9 100644 (file)
--- a/base/application.h
+++ b/base/application.h
@@ -52,10 +52,10 @@ public:
 
 int I2_EXPORT application_main(int argc, char **argv, icinga::Application *instance);
 
-#define SET_START_CLASS(klass)                                                                 \
-       int main(int argc, char **argv) {                                                       \
-               klass *instance = new klass();          \
-               return application_main(argc, argv, instance);                  \
+#define IMPLEMENT_ENTRY_POINT(klass)                                   \
+       int main(int argc, char **argv) {                                       \
+               klass *instance = new klass();                                  \
+               return application_main(argc, argv, instance);  \
        }
 
 #endif /* APPLICATION_H */

diff --git a/base/base.vcxproj b/base/base.vcxproj
index 6ad5a6c67302de9324779cfe04f122bcba85289a..ffc05ae7f4507b1310e18aa15e8b9ca7b17026aa 100644 (file)
--- a/base/base.vcxproj
+++ b/base/base.vcxproj
@@ -112,6 +112,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDLL;I2_BASE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/cJSON/cJSON.vcxproj b/cJSON/cJSON.vcxproj
index a14805982de8e638003845d7a1b74a8967f7a672..e759aa63af4c4cda191fd849c93e3cc26212541a 100644 (file)
--- a/cJSON/cJSON.vcxproj
+++ b/cJSON/cJSON.vcxproj
@@ -66,6 +66,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/components/Makefile.am b/components/Makefile.am
new file mode 100644 (file)
index 0000000..846d3a4
--- /dev/null
+++ b/components/Makefile.am
@@ -0,0 +1,5 @@
+## Process this file with automake to produce Makefile.in
+## Created by Anjuta
+
+SUBDIRS = configfile \
+       configrpc
\ No newline at end of file

diff --git a/components/configfile/Makefile.am b/components/configfile/Makefile.am
new file mode 100644 (file)
index 0000000..2fb90b2
--- /dev/null
+++ b/components/configfile/Makefile.am
@@ -0,0 +1,17 @@
+## Process this file with automake to produce Makefile.in
+
+pkglib_LTLIBRARIES =  \
+       configfile.la
+
+configfile_la_SOURCES =  \
+       configfile.cpp \
+       configfile.h \
+       i2-configfile.h
+
+configfile_la_CXXFLAGS = -I${top_srcdir}/base \
+       -I${top_srcdir}/jsonrpc \
+       -I${top_srcdir}/cJSON
+
+configfile_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined
+configfile_la_LIBADD = ${top_builddir}/base/libbase.la \
+       ${top_builddir}/cJSON/libcJSON.la

diff --git a/configfilecomponent/configfilecomponent.vcxproj b/components/configfile/configfile.vcxproj
similarity index 97%
rename from configfilecomponent/configfilecomponent.vcxproj
rename to components/configfile/configfile.vcxproj
index bf7d0199c4f649c2508b6730e6a67805c0b70f76..ea027953d2bda7e8d0ad268c7522b3012112af28 100644 (file)
--- a/configfilecomponent/configfilecomponent.vcxproj
+++ b/components/configfile/configfile.vcxproj
@@ -15,7 +15,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="configfilecomponent.h" />
-    <ClInclude Include="i2-configfilecomponent.h" />
+    <ClInclude Include="i2-configfile.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E58F1DA7-B723-412B-B2B7-7FF58E2A944E}</ProjectGuid>
@@ -79,6 +79,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/configfilecomponent/configfilecomponent.cpp b/components/configfile/configfilecomponent.cpp
similarity index 100%
rename from configfilecomponent/configfilecomponent.cpp
rename to components/configfile/configfilecomponent.cpp

diff --git a/configfilecomponent/configfilecomponent.h b/components/configfile/configfilecomponent.h
similarity index 100%
rename from configfilecomponent/configfilecomponent.h
rename to components/configfile/configfilecomponent.h

diff --git a/configfilecomponent/i2-configfilecomponent.h b/components/configfile/i2-configfile.h
similarity index 100%
rename from configfilecomponent/i2-configfilecomponent.h
rename to components/configfile/i2-configfile.h

diff --git a/configrpccomponent/Makefile.am b/components/configrpc/Makefile.am
similarity index 53%
rename from configrpccomponent/Makefile.am
rename to components/configrpc/Makefile.am
index 712ea778fdcae68157d954b822e7cae15ec613fa..07cf53aef164f03fcc6e5f76000805feddfa7b14 100644 (file)
--- a/configrpccomponent/Makefile.am
+++ b/components/configrpc/Makefile.am
@@ -1,20 +1,20 @@
 ## Process this file with automake to produce Makefile.in
 
 pkglib_LTLIBRARIES =  \
-       configrpccomponent.la
+       configrpc.la
 
-configrpccomponent_la_SOURCES =  \
+configrpc_la_SOURCES =  \
        configrpccomponent.cpp \
        configrpccomponent.h \
-       i2-configrpccomponent.h
+       i2-configrpc.h
 
-configrpccomponent_la_CXXFLAGS = -I${top_srcdir}/base \
+configrpc_la_CXXFLAGS = -I${top_srcdir}/base \
        -I${top_srcdir}/jsonrpc \
        -I${top_srcdir}/cJSON \
        -I${top_srcdir}/icinga
 
-configrpccomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread
-configrpccomponent_la_LIBADD = ${top_builddir}/base/libbase.la \
+configrpc_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread
+configrpc_la_LIBADD = ${top_builddir}/base/libbase.la \
        ${top_builddir}/jsonrpc/libjsonrpc.la \
        ${top_builddir}/cJSON/libcJSON.la \
        ${top_builddir}/icinga/libicinga.la

diff --git a/configrpccomponent/configrpccomponent.vcxproj b/components/configrpc/configrpc.vcxproj
similarity index 97%
rename from configrpccomponent/configrpccomponent.vcxproj
rename to components/configrpc/configrpc.vcxproj
index 66fc0443b3d60b76e3d8db908c7cc3838730d9da..11c0c2779e52dbf26e86e65a0a445e6ddabdfaa2 100644 (file)
--- a/configrpccomponent/configrpccomponent.vcxproj
+++ b/components/configrpc/configrpc.vcxproj
@@ -15,7 +15,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="configrpccomponent.h" />
-    <ClInclude Include="i2-configrpccomponent.h" />
+    <ClInclude Include="i2-configrpc.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{697C6D7E-3109-484C-A7AF-384D28711610}</ProjectGuid>
@@ -77,6 +77,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CONFIGCOMPONENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/configrpccomponent/configrpccomponent.cpp b/components/configrpc/configrpccomponent.cpp
similarity index 100%
rename from configrpccomponent/configrpccomponent.cpp
rename to components/configrpc/configrpccomponent.cpp

diff --git a/configrpccomponent/configrpccomponent.h b/components/configrpc/configrpccomponent.h
similarity index 100%
rename from configrpccomponent/configrpccomponent.h
rename to components/configrpc/configrpccomponent.h

diff --git a/configrpccomponent/i2-configrpccomponent.h b/components/configrpc/i2-configrpc.h
similarity index 53%
rename from configrpccomponent/i2-configrpccomponent.h
rename to components/configrpc/i2-configrpc.h
index dd3d9c983cbc932cfb7452c0c26c65d65a1aec7d..188288bf349fa6f88738ee829a5dfb3721c15c8f 100644 (file)
--- a/configrpccomponent/i2-configrpccomponent.h
+++ b/components/configrpc/i2-configrpc.h
@@ -1,5 +1,5 @@
-#ifndef I2CONFIGCOMPONENT_H
-#define I2CONFIGCOMPONENT_H
+#ifndef I2CONFIGRPC_H
+#define I2CONFIGRPC_H
 
 #include <i2-base.h>
 #include <i2-jsonrpc.h>
@@ -7,4 +7,4 @@
 
 #include "configrpccomponent.h"
 
-#endif /* I2CONFIGCOMPONENT_H */
+#endif /* I2CONFIGRPC_H */

diff --git a/configfilecomponent/Makefile.am b/configfilecomponent/Makefile.am
deleted file mode 100644 (file)
index a61f35b..0000000
--- a/configfilecomponent/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-pkglib_LTLIBRARIES =  \
-       configfilecomponent.la
-
-configfilecomponent_la_SOURCES =  \
-       configfilecomponent.cpp \
-       configfilecomponent.h \
-       i2-configfilecomponent.h
-
-configfilecomponent_la_CXXFLAGS = -I${top_srcdir}/base \
-       -I${top_srcdir}/jsonrpc \
-       -I${top_srcdir}/cJSON
-
-configfilecomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined
-configfilecomponent_la_LIBADD = ${top_builddir}/base/libbase.la \
-       ${top_builddir}/cJSON/libcJSON.la

diff --git a/icinga-app/icinga-app.vcxproj b/icinga-app/icinga-app.vcxproj
index 4d972431c5fb37cb08936acefb4ecc464f0ed64f..1091d7d86095dd49722988e0e3481975cbdabc86 100644 (file)
--- a/icinga-app/icinga-app.vcxproj
+++ b/icinga-app/icinga-app.vcxproj
@@ -74,6 +74,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I2_ICINGALAUNCHER_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 81c83740ac334941d19e776f94a2a4777ac076d1..17d4aff7c097c30f75e2c8ef9253c89b90ad3141 100644 (file)
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -1,3 +1,5 @@
 #include <i2-icinga.h>
 
-SET_START_CLASS(icinga::IcingaApplication);
+using namespace icinga;
+
+IMPLEMENT_ENTRY_POINT(IcingaApplication);

diff --git a/icinga.sln b/icinga.sln
index 08e26fc4d9b8bc0cbe53bde9b873010adcb5763e..b165bd7f1a0f39d81b781bca8ff81433d71fe95c 100644 (file)
--- a/icinga.sln
+++ b/icinga.sln
@@ -9,27 +9,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsonrpc", "jsonrpc\jsonrpc.
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configfilecomponent", "configfilecomponent\configfilecomponent.vcxproj", "{E58F1DA7-B723-412B-B2B7-7FF58E2A944E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cJSON", "cJSON\cJSON.vcxproj", "{66BED474-C33F-48F9-90BA-BBCFEDC006B8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga", "icinga\icinga.vcxproj", "{C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}"
        ProjectSection(ProjectDependencies) = postProject
-               {66BED474-C33F-48F9-90BA-BBCFEDC006B8} = {66BED474-C33F-48F9-90BA-BBCFEDC006B8}
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
                {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} = {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}
-               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configrpccomponent", "configrpccomponent\configrpccomponent.vcxproj", "{697C6D7E-3109-484C-A7AF-384D28711610}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga-app", "icinga-app\icinga-app.vcxproj", "{BE412865-FEBA-4259-AD41-58950D1F5432}"
        ProjectSection(ProjectDependencies) = postProject
-               {66BED474-C33F-48F9-90BA-BBCFEDC006B8} = {66BED474-C33F-48F9-90BA-BBCFEDC006B8}
-               {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} = {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cJSON", "cJSON\cJSON.vcxproj", "{66BED474-C33F-48F9-90BA-BBCFEDC006B8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga", "icinga\icinga.vcxproj", "{C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configfile", "components\configfile\configfile.vcxproj", "{E58F1DA7-B723-412B-B2B7-7FF58E2A944E}"
+       ProjectSection(ProjectDependencies) = postProject
+               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
+       EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga-app", "icinga-app\icinga-app.vcxproj", "{BE412865-FEBA-4259-AD41-58950D1F5432}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configrpc", "components\configrpc\configrpc.vcxproj", "{697C6D7E-3109-484C-A7AF-384D28711610}"
+       ProjectSection(ProjectDependencies) = postProject
+               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
+       EndProjectSection
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,14 +46,6 @@ Global
                {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win32.Build.0 = Debug|Win32
                {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win32.ActiveCfg = Release|Win32
                {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win32.Build.0 = Release|Win32
-               {E58F1DA7-B723-412B-B2B7-7FF58E2A944E}.Debug|Win32.ActiveCfg = Debug|Win32
-               {E58F1DA7-B723-412B-B2B7-7FF58E2A944E}.Debug|Win32.Build.0 = Debug|Win32
-               {E58F1DA7-B723-412B-B2B7-7FF58E2A944E}.Release|Win32.ActiveCfg = Release|Win32
-               {E58F1DA7-B723-412B-B2B7-7FF58E2A944E}.Release|Win32.Build.0 = Release|Win32
-               {697C6D7E-3109-484C-A7AF-384D28711610}.Debug|Win32.ActiveCfg = Debug|Win32
-               {697C6D7E-3109-484C-A7AF-384D28711610}.Debug|Win32.Build.0 = Debug|Win32
-               {697C6D7E-3109-484C-A7AF-384D28711610}.Release|Win32.ActiveCfg = Release|Win32
-               {697C6D7E-3109-484C-A7AF-384D28711610}.Release|Win32.Build.0 = Release|Win32
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win32.ActiveCfg = Debug|Win32
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win32.Build.0 = Debug|Win32
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win32.ActiveCfg = Release|Win32
@@ -65,6 +58,14 @@ Global
                {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win32.Build.0 = Debug|Win32
                {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win32.ActiveCfg = Release|Win32
                {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win32.Build.0 = Release|Win32
+               {E58F1DA7-B723-412B-B2B7-7FF58E2A944E}.Debug|Win32.ActiveCfg = Debug|Win32
+               {E58F1DA7-B723-412B-B2B7-7FF58E2A944E}.Debug|Win32.Build.0 = Debug|Win32
+               {E58F1DA7-B723-412B-B2B7-7FF58E2A944E}.Release|Win32.ActiveCfg = Release|Win32
+               {E58F1DA7-B723-412B-B2B7-7FF58E2A944E}.Release|Win32.Build.0 = Release|Win32
+               {697C6D7E-3109-484C-A7AF-384D28711610}.Debug|Win32.ActiveCfg = Debug|Win32
+               {697C6D7E-3109-484C-A7AF-384D28711610}.Debug|Win32.Build.0 = Debug|Win32
+               {697C6D7E-3109-484C-A7AF-384D28711610}.Release|Win32.ActiveCfg = Release|Win32
+               {697C6D7E-3109-484C-A7AF-384D28711610}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/icinga/icinga.vcxproj b/icinga/icinga.vcxproj
index 5e075a9bdaf307a41314b24068c48f32d951d572..7f131b0edbc99fd18d910ff0a110fc71d0cefe81 100644 (file)
--- a/icinga/icinga.vcxproj
+++ b/icinga/icinga.vcxproj
@@ -86,6 +86,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I2_ICINGA_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/jsonrpc/jsonrpc.vcxproj b/jsonrpc/jsonrpc.vcxproj
index 87cbda58ba6365c83fd8702ac6f77d20fc12a9bf..d009f244a9ff171c10a7a91275ca4da170595ba5 100644 (file)
--- a/jsonrpc/jsonrpc.vcxproj
+++ b/jsonrpc/jsonrpc.vcxproj
@@ -85,6 +85,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I2_JSONRPC_BUILD;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>