Prepare 9.3.3 (#18)

* Update cpptango to release 9.3.3

* Update assets/README...
... to show changes between 9.2.5a and 9.3.3

* Update assets/TANGO_CHANGES for 9.3.3
Minimal text explanation in this version.

* Update TangoAccessControl to Release 2.14

* Update to latest available release versions
Update AtkPanel to      Release 5.8
Update JSSHTerminal to  Release 1.13
Update tango_admin to   Release 1.14

* Fix missing separator error in common_target.opt

Fix the following error (a tab was missing):
common_target.opt:166: *** missing separator.

* Update build.xml
Use copy ant task instead of deprecated copydir task

* Cleanup POGO (#20)

Remove obsolete POGO templates
Remove pogo-6

* Update astor to release 7.2.5

* rename atkpanel to ATKPanel in java applications (fixes #25) (#27)

* Pass correct arguments to TangoRestServer (fixes #24) (#26)

* Remove zmq.hpp (#23) (#28)

* Add logback configuration file (#21) (#29)

* Merge liblog4tango into libtango (change to convenience lib) (#30) (#31)

Change log4tango into a libtool convenience library.
liblog4tango.so is no longer generated, but log4tango objects are still compiled and are now linked into libtango.so

* Update README

* Remove my.cnf config file (tango-controls/TangoDatabase#16) (#35)

* Remove log4tango from tango.pc & makefiles; add dummy liblog4tango.so (#33)

* Add CMake opt files (#34) (#36)

Add cmake_common_target.opt and cmake_tango.opt to the distribution
in order to be able to generate CMakeLists.txt files for Device
Servers from Pogo.

* Compile with -std=c++0x when using g++ < 6.1

* Update to latest available release versions (#37)

Update to latest available release versions
Update Jive to          Release 7.22
Update ATK to           Release 9.3.6
Update Pogo to          Release 9.6.23
Update rest-server to   Release 1.14
Update TangoDatabase to Release 5.11
Update JTango to 9.5.14

assets/README

@@ -1,4 +1,4 @@
-		TANGO source code release version 9.2.5a - README (01/2017)
+		TANGO source code release version 9.3.3 - README (03/2019)
 		==========================================================
 
 
@@ -62,7 +62,7 @@ This source code release contains :
 
 (1) Tango C++ library source files and java library and application jar files
 
-(2) The Tango database device server source files and the database configuration files (.my.cnf).
+(2) The Tango database device server source files.
 
 (3) The Jive application. 
 
@@ -265,6 +265,14 @@ allow you to select which database user configure will use.
 You can also use the user and password entries of the my.cnf file
 to set-up your connection to the database.
 
+Note: It is recommended to setup the database to use latin1 character set.
+Especially, any other character set with characters longer than 3 bytes
+will not work. Character set can be specified in my.cnf configuration file:
+
+[mysqld]
+character_set_server=latin1
+collation_server=latin1_swedish_ci
+
 To disable any access to the database use the --disable-dbcreate option.
 
 Database server, mysql and libz
@@ -526,6 +534,27 @@ documentation, news and to download add-on packages.
 See the file TANGO_CHANGES to get an overview of all modification
 between the different Tango library versions.
 
+Changes between Tango distribution 9.2.5a and 9.3.3
+--------------------------------------------------
+
+- Updated C++ library to                        Release 9.3.3
+- Updated JTango to                             Release 9.5.14
+- Updated Jive to                               Release 7.22
+- Updated ATK to                                Release 9.3.6
+- Updated AtkPanel to                           Release 5.8
+- Updated atktuning to                          Release 4.7
+- Updated Astor to                              Release 7.2.5
+- Updated JSSHTerminal to                       Release 1.13
+- Updated LogViewer to                          Release 2.0.5
+- Updated Pogo to                               Release 9.6.23
+- Added rest-server                             Release 1.14
+- Updated TangoTest to                          Release 2.1
+- Updated TangoDatabase to                      Release 5.11
+- Updated TangoAccessControl to                 Release 2.14
+- Updated Starter to                            Release 7.0
+- Updated tango_admin to                        Release 1.14
+- Removed Pogo 6
+
 Changes between Tango distribution 9.2.5 and 9.2.5a
 --------------------------------------------------
 

assets/TANGO_CHANGES

@@ -1,5 +1,15 @@
 TANGO history file
 
+03/2019        *******************************************************
+               *                                                     *
+               *  Tango release 9.3.3 : Changes since version 9.2.5a *
+               *                                                     *
+               *******************************************************
+
+- Please refer to the release notes and changelog files of the different 
+[tango-controls Github repositories](https://github.com/tango-controls) 
+to get a detailed list of changes and bug fixes.
+
 01/2016        *******************************************************
                *                                                     *
                *  Tango release 9.2.5a : Changes since version 9.2.5 *

assets/configure.ac

@@ -481,7 +481,6 @@ AC_OUTPUT(Makefile
 	  cppserver/database/Makefile
 	  cppserver/database/create_db.sql	
 	  cppserver/database/create_db.sh
-	  cppserver/database/my.cnf
 	  cppserver/database/stored_proc.sql
 	  cppserver/database/create_db_tables.sql
 	  cppserver/database/update_db.sh
@@ -502,9 +501,7 @@ AC_OUTPUT(Makefile
   	  doc/Makefile
 	  doc/man/Makefile
 	  pogo/Makefile
-	  pogo/templates/Makefile
-	  pogo/preferences/Makefile
-	  pogo/templates/cpp/Makefile)
+	  pogo/preferences/Makefile)
 
 
 AC_MSG_RESULT([

assets/cppserver/database/Makefile.am

@@ -9,8 +9,8 @@ AM_CPPFLAGS = $(ORB_INCLUDE_PREFIX)  $(LIBZMQ_CFLAGS) \
 
 AM_CXXFLAGS= -Wall -D_FORTIFY_SOURCE=2 -O1 -fPIE
 
-LDADD = -L$(top_builddir)/lib/cpp/client -ltango -L$(top_builddir)/lib/cpp/log4tango/src \
-        -llog4tango $(DB_LDFLAGS) \
+LDADD = -L$(top_builddir)/lib/cpp/client -ltango \
+         $(DB_LDFLAGS) \
          $(DB_LDLIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS)  $(LIBZMQ_LIBS)
 
 AM_LDFLAGS = -Wl,-z,now -pie
@@ -31,7 +31,7 @@ DataBaseds_SOURCES=ClassFactory.cpp          \
 if TANGO_DB_CREATE_ENABLED
 
 dbdir=${pkgdatadir}/db
-db_DATA=create_db.sh create_db.sql my.cnf create_db_tables.sql stored_proc.sql update_db.sh update_db.sql update_db8.sql update_db7.sql rem_history.sql
+db_DATA=create_db.sh create_db.sql create_db_tables.sql stored_proc.sql update_db.sh update_db.sql update_db8.sql update_db7.sql rem_history.sql
 
 ## This is to make sure that the create-db script is run on each make all.
 ## See create_db.sh for more information.
@@ -40,7 +40,7 @@ all-local: .force
 
 endif
 
-EXTRA_DIST    = create_db.sh.in create_db.sql.in my.cnf.in create_db_tables.sql.in stored_proc.sql.in \
+EXTRA_DIST    = create_db.sh.in create_db.sql.in create_db_tables.sql.in stored_proc.sql.in \
                 update_db.sh.in update_db8.sql.in update_db7.sql.in update_db.sql.in rem_history.sql.in
 
 .force:

assets/cppserver/starter/Makefile.am

@@ -7,7 +7,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib/cpp/server \
            -I$(top_builddir)/lib/cpp/log4tango/include $(LIBZMQ_CFLAGS)
 
 LDADD = -L$(top_builddir)/lib/cpp/client -ltango \
-        -L$(top_builddir)/lib/cpp/log4tango/src -llog4tango \
 		$(LIBZMQ_LIBS)
 
 bin_PROGRAMS=Starter

assets/cppserver/tangoaccesscontrol/Makefile.am

@@ -21,6 +21,5 @@ TangoAccessControl_SOURCES=ClassFactory.cpp     		\
 
 
 TangoAccessControl_LDADD = -L$(top_builddir)/lib/cpp/client -ltango \
-        					-L$(top_builddir)/lib/cpp/log4tango/src -llog4tango \
 							$(DB_LDFLAGS) $(DB_LDLIBS) $(LIBZMQ_LIBS) \
 							../AbstractClass/AccessControl/libaccesscontrol.la

assets/cppserver/tangotest/Makefile.am

@@ -6,7 +6,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib/cpp/client \
            -I$(top_builddir)/lib/cpp/log4tango/include  $(LIBZMQ_CFLAGS)
 
 LDADD = -L$(top_builddir)/lib/cpp/client -ltango \
-        -L$(top_builddir)/lib/cpp/log4tango/src -llog4tango \
  		$(LIBZMQ_LIBS)
 
 bin_PROGRAMS=TangoTest

assets/lib/cpp/client/Makefile.am

@@ -15,7 +15,7 @@ libtango_la_LIBADD = ../server/libserver.la	\
              ../server/idl/libidl.la \
 		     ../server/jpeg/libjpeg.la \
 		     ../server/jpeg_mmx/libjpeg_mmx.la \
-		     ../log4tango/src/liblog4tango.la \
+		     ../log4tango/src/liblog4tangointernal.la \
 		     $(LIBZMQ_LIBS)
 
 # We need to set the -version-info for libtool so that libtool will
@@ -87,5 +87,4 @@ tangoinclude_HEADERS = accessproxy.h        \
                        devapi_attr.tpp      \
                        devapi_utils.tpp     \
                        api_util.tpp         \
-                       devapi_pipe.tpp      \
-                       zmq.hpp
+                       devapi_pipe.tpp