merge feature/changesAfter3_0_2; resolve conflicts

exampleDatabase/src/Makefile

@@ -4,17 +4,20 @@ include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
 
-DBD += exampleDatabaseRegister.dbd
+DBD += exampleDatabase.dbd
 
 INC += exampleDatabase.h
+INC += exampleMonitorPlugin.h
 
 LIBRARY += exampleDatabase
 exampleDatabase_SRCS += exampleDatabase.cpp
+exampleDatabase_SRCS += exampleMonitorPlugin.cpp
 exampleDatabase_SRCS += exampleDatabaseRegister.cpp
-exampleDatabase_LIBS += powerSupply
+exampleDatabase_SRCS += exampleMonitorPluginRegister.cpp
 exampleDatabase_LIBS += pvDatabase
 exampleDatabase_LIBS += pvAccess
 exampleDatabase_LIBS += pvData
+exampleDatabase_LIBS += Com
 exampleDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 PROD_HOST += exampleDatabaseMain

exampleDatabase/src/exampleDatabase.cpp

@@ -26,8 +26,8 @@
 #include <pv/recordList.h>
 #include <pv/traceRecord.h>
 
-#include <powerSupply.h>
-#include <exampleDatabase.h>
+#include <pv/powerSupply.h>
+#include <pv/exampleDatabase.h>
 
 using namespace std;
 using std::tr1::static_pointer_cast;

exampleDatabase/src/exampleDatabaseMain.cpp

@@ -22,7 +22,8 @@
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 
-#include <exampleDatabase.h>
+#include <pv/exampleDatabase.h>
+#include <pv/exampleMonitorPlugin.h>
 
 using namespace std;
 using std::tr1::static_pointer_cast;
@@ -36,6 +37,7 @@ int main(int argc,char *argv[])
     PVDatabasePtr master = PVDatabase::getMaster();
     ChannelProviderLocalPtr channelProvider = getChannelProviderLocal();
     ExampleDatabase::create();
+    ExampleMonitorPlugin::create();
     ServerContext::shared_pointer ctx =
         startPVAServer(PVACCESS_ALL_PROVIDERS,0,true,true);
     cout << "exampleDatabase\n";
@@ -55,4 +57,3 @@ int main(int argc,char *argv[])
     channelProvider->destroy();
     return 0;
 }
-

exampleDatabase/src/exampleDatabaseRegister.cpp

@@ -33,7 +33,7 @@
 
 #include <epicsExport.h>
 
-#include <exampleDatabase.h>
+#include <pv/exampleDatabase.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;