Index: /XIOS/trunk/arch/arch-BG_FERMI.fcm
===================================================================
--- /XIOS/trunk/arch/arch-BG_FERMI.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-BG_FERMI.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-BG_TURING.fcm
===================================================================
--- /XIOS/trunk/arch/arch-BG_TURING.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-BG_TURING.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-GCC_LINUX.fcm
===================================================================
--- /XIOS/trunk/arch/arch-GCC_LINUX.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-GCC_LINUX.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-GCC_MACOSX.fcm
===================================================================
--- /XIOS/trunk/arch/arch-GCC_MACOSX.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-GCC_MACOSX.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-PW6_VARGAS.fcm
===================================================================
--- /XIOS/trunk/arch/arch-PW6_VARGAS.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-PW6_VARGAS.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-X64_ADA.fcm
===================================================================
--- /XIOS/trunk/arch/arch-X64_ADA.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-X64_ADA.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-X64_ATHENA.fcm
===================================================================
--- /XIOS/trunk/arch/arch-X64_ATHENA.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-X64_ATHENA.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-X64_CURIE.fcm
===================================================================
--- /XIOS/trunk/arch/arch-X64_CURIE.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-X64_CURIE.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-X64_CURIE_GCC.fcm
===================================================================
--- /XIOS/trunk/arch/arch-X64_CURIE_GCC.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-X64_CURIE_GCC.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-X64_CURIE_PGI.fcm
===================================================================
--- /XIOS/trunk/arch/arch-X64_CURIE_PGI.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-X64_CURIE_PGI.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-X64_CURIE_VAMPIR.fcm
===================================================================
--- /XIOS/trunk/arch/arch-X64_CURIE_VAMPIR.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-X64_CURIE_VAMPIR.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-X64_HORUS.fcm
===================================================================
--- /XIOS/trunk/arch/arch-X64_HORUS.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-X64_HORUS.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-X64_JADE.fcm
===================================================================
--- /XIOS/trunk/arch/arch-X64_JADE.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-X64_JADE.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-X64_TITANE.fcm
===================================================================
--- /XIOS/trunk/arch/arch-X64_TITANE.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-X64_TITANE.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-X64_TITANE_VAMPIR.fcm
===================================================================
--- /XIOS/trunk/arch/arch-X64_TITANE_VAMPIR.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-X64_TITANE_VAMPIR.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-XC30_Cray.fcm
===================================================================
--- /XIOS/trunk/arch/arch-XC30_Cray.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-XC30_Cray.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/arch/arch-XE6_LYNX.fcm
===================================================================
--- /XIOS/trunk/arch/arch-XE6_LYNX.fcm	(revision 590)
+++ /XIOS/trunk/arch/arch-XE6_LYNX.fcm	(revision 591)
@@ -1,4 +1,4 @@
 ################################################################################
-###################        Projet xios - xmlioserver       #####################
+###################                Projet XIOS               ###################
 ################################################################################
 
Index: /XIOS/trunk/make_xios
===================================================================
--- /XIOS/trunk/make_xios	(revision 590)
+++ /XIOS/trunk/make_xios	(revision 591)
@@ -113,5 +113,5 @@
    then
      ln -s $PWD/.void_dir $PWD/extern/netcdf4
-     XMLIO_CPPKEY="$XMLIO_CPPKEY USING_NETCDF_PAR"
+     XIOS_CPPKEY="$XIOS_CPPKEY USING_NETCDF_PAR"
 elif [[ "$netcdf_lib" == "netcdf4_seq" ]]
   then 
@@ -120,5 +120,5 @@
   then 
     ln -s $PWD/extern/src_netcdf4 $PWD/extern/netcdf4
-    XMLIO_CPPKEY="$XMLIO_CPPKEY USING_NETCDF_PAR USING_NETCDF_INTERNAL"
+    XIOS_CPPKEY="$XIOS_CPPKEY USING_NETCDF_PAR USING_NETCDF_INTERNAL"
     export NETCDF_INCDIR="-I${PWD}/extern/netcdf4"
     export NETCDF_LIBDIR=""
@@ -133,8 +133,8 @@
     if [[ "$oasis" == "oasis3_mct" ]]
     then
-	XMLIO_CPPKEY="$XMLIO_CPPKEY USE_OMCT"
+	XIOS_CPPKEY="$XIOS_CPPKEY USE_OMCT"
     elif [[ "$oasis" == "oasis3"  ]]
     then
-	XMLIO_CPPKEY="$XMLIO_CPPKEY USE_OASIS"
+	XIOS_CPPKEY="$XIOS_CPPKEY USE_OASIS"
 	OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1"
 	OASIS_LIBDIR="-L$PWD/../../prism/X64/lib"
@@ -145,27 +145,27 @@
     fi
     NETCDF_LIB="-lnetcdff -lnetcdf"
-    XMLIO_FINCDIR="$OASIS_INCDIR $XMLIO_FINCDIR"
-    XMLIO_LIB="$OASIS_LIBDIR $OASIS_LIB $XMLIO_LIB"
+    XIOS_FINCDIR="$OASIS_INCDIR $XIOS_FINCDIR"
+    XIOS_LIB="$OASIS_LIBDIR $OASIS_LIB $XIOS_LIB"
 fi 
 
 if [[ "$use_memtrack" == "true" ]]
    then
-   XMLIO_LIB="$ADDR2LINE_LIBDIR $ADDR2LINE_LIB $XMLIO_LIB"
-   XMLIO_CPPKEY="$XMLIO_CPPKEY XIOS_MEMTRACK"
+   XIOS_LIB="$ADDR2LINE_LIBDIR $ADDR2LINE_LIB $XIOS_LIB"
+   XIOS_CPPKEY="$XIOS_CPPKEY XIOS_MEMTRACK"
 fi 
 
-XMLIO_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR"
-XMLIO_FINCDIR="$XMLIO_FINCDIR $MPI_INCDIR"
+XIOS_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR"
+XIOS_FINCDIR="$XIOS_FINCDIR $MPI_INCDIR"
 
-XMLIO_LIB="$XMLIO_LIB $NETCDF_LIBDIR $HDF5_LIBDIR $MPI_LIBDIR $NETCDF_LIB $HDF5_LIB $MPI_LIB"
+XIOS_LIB="$XIOS_LIB $NETCDF_LIBDIR $HDF5_LIBDIR $MPI_LIBDIR $NETCDF_LIB $HDF5_LIB $MPI_LIB"
 
 rm -f config.fcm
 echo "%COMPIL_CFLAGS $COMPIL_CFLAGS" >> config.fcm
 echo "%COMPIL_FFLAGS $COMPIL_FFLAGS" >> config.fcm
-echo "%CPP_KEY       $XMLIO_CPPKEY"  >> config.fcm
+echo "%CPP_KEY       $XIOS_CPPKEY"   >> config.fcm
 
-echo "%CBASE_INC     $XMLIO_CINCDIR" >> config.fcm     
-echo "%FBASE_INC     $XMLIO_FINCDIR" >> config.fcm
-echo "%ARCH_LD       $XMLIO_LIB" >> config.fcm 
+echo "%CBASE_INC     $XIOS_CINCDIR" >> config.fcm     
+echo "%FBASE_INC     $XIOS_FINCDIR" >> config.fcm
+echo "%ARCH_LD       $XIOS_LIB"     >> config.fcm 
 
 echo "=> Using "$compil_mode" mode for compiling under architecture \""$arch"\" !"
@@ -182,7 +182,4 @@
 export PATH=$PWD/tools/FCM/bin:$PATH
 
-#$make_dir/tools/preprocess_cpp $make_dir/src/xmlio/iface/interface.cpp      $make_dir/src/xmlio/iface/interface.cpp.in
-#$make_dir/tools/preprocess_f03 $make_dir/src/xmlio/fortran/ixmlioserver.f90 $make_dir/src/xmlio/fortran/ixmlioserver.f03.in
-
 if [[ "$compil_full" == "true" ]]
    then
@@ -197,6 +194,6 @@
   then
   set nothing
-#    cd $WORKDIR/XMLIO_NEMO_COUPLE/modeles/NEMO/WORK
-#    cd $WORKDIR/XMLIO_NEMO/modeles/NEMO/WORK
+#    cd $WORKDIR/XIOS_NEMO_COUPLE/modeles/NEMO/WORK
+#    cd $WORKDIR/XIOS_NEMO/modeles/NEMO/WORK
 #    make
 fi
Index: /XIOS/trunk/src/array.hpp
===================================================================
--- /XIOS/trunk/src/array.hpp	(revision 590)
+++ /XIOS/trunk/src/array.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_CArray__
-#define __XMLIO_CArray__
+#ifndef __XIOS_CArray__
+#define __XIOS_CArray__
 
 /// boost headers ///
@@ -7,6 +7,6 @@
 #include <boost/multi_array.hpp>
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "buffer_in.hpp"
 #include "buffer_out.hpp"
@@ -91,3 +91,3 @@
    template <typename ValueType> void FromBinary(StdIStream & is, ARRAY(ValueType, 3) & array) ;
 }
-#endif // __XMLIO_CArray__
+#endif // __XIOS_CArray__
Index: /XIOS/trunk/src/array_mac.hpp
===================================================================
--- /XIOS/trunk/src/array_mac.hpp	(revision 590)
+++ /XIOS/trunk/src/array_mac.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_CArray_mac__
-#define __XMLIO_CArray_mac__
+#ifndef __XIOS_CArray_mac__
+#define __XIOS_CArray_mac__
 
 /// ////////////////////// Macros ////////////////////// ///
@@ -24,3 +24,3 @@
 ///---------------------------------------------------------------
 
-#endif // __XMLIO_CArray_mac__
+#endif // __XIOS_CArray_mac__
Index: /XIOS/trunk/src/attribute.hpp
===================================================================
--- /XIOS/trunk/src/attribute.hpp	(revision 590)
+++ /XIOS/trunk/src/attribute.hpp	(revision 591)
@@ -1,10 +1,10 @@
-#ifndef __XMLIO_CAttribute__
-#define __XMLIO_CAttribute__
+#ifndef __XIOS_CAttribute__
+#define __XIOS_CAttribute__
 
 /// boost headers ///
 #include <boost/any.hpp>
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "object.hpp"
 #include "base_type.hpp"
@@ -116,3 +116,3 @@
   // namespace xios
 
-#endif // __XMLIO_CAttribute__
+#endif // __XIOS_CAttribute__
Index: /XIOS/trunk/src/attribute_array.hpp
===================================================================
--- /XIOS/trunk/src/attribute_array.hpp	(revision 590)
+++ /XIOS/trunk/src/attribute_array.hpp	(revision 591)
@@ -2,6 +2,6 @@
 #define __XIOS_ATTRIBUTE_ARRAY__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "attribute.hpp"
Index: /XIOS/trunk/src/attribute_enum.hpp
===================================================================
--- /XIOS/trunk/src/attribute_enum.hpp	(revision 590)
+++ /XIOS/trunk/src/attribute_enum.hpp	(revision 591)
@@ -2,6 +2,6 @@
 #define __XIOS_ATTRIBUTE_ENUM__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "attribute.hpp"
Index: /XIOS/trunk/src/attribute_map.cpp
===================================================================
--- /XIOS/trunk/src/attribute_map.cpp	(revision 590)
+++ /XIOS/trunk/src/attribute_map.cpp	(revision 591)
@@ -708,3 +708,3 @@
          oss << "END SUBROUTINE xios(is_defined_" << className << "_attr)" << std::endl;
       }
-} // namespace xmlioser
+} // namespace xios
Index: /XIOS/trunk/src/attribute_map.hpp
===================================================================
--- /XIOS/trunk/src/attribute_map.hpp	(revision 590)
+++ /XIOS/trunk/src/attribute_map.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CAttributeMap__
-#define __XMLIO_CAttributeMap__
+#ifndef __XIOS_CAttributeMap__
+#define __XIOS_CAttributeMap__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "attribute.hpp"
 #include "attribute_template.hpp"
@@ -74,3 +74,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CAttributeMap__
+#endif // __XIOS_CAttributeMap__
Index: /XIOS/trunk/src/attribute_template.hpp
===================================================================
--- /XIOS/trunk/src/attribute_template.hpp	(revision 590)
+++ /XIOS/trunk/src/attribute_template.hpp	(revision 591)
@@ -1,10 +1,10 @@
-#ifndef __XMLIO_CAttributeTemplate__
-#define __XMLIO_CAttributeTemplate__
+#ifndef __XIOS_CAttributeTemplate__
+#define __XIOS_CAttributeTemplate__
 
 /// boost headers ///
 #include <boost/lexical_cast.hpp>
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "attribute.hpp"
@@ -102,3 +102,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CAttributeTemplate__
+#endif // __XIOS_CAttributeTemplate__
Index: /XIOS/trunk/src/attribute_template_impl.hpp
===================================================================
--- /XIOS/trunk/src/attribute_template_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/attribute_template_impl.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_CAttributeTemplate_impl__
-#define __XMLIO_CAttributeTemplate_impl__
+#ifndef __XIOS_CAttributeTemplate_impl__
+#define __XIOS_CAttributeTemplate_impl__
 
 #include "type.hpp"
@@ -357,3 +357,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CAttributeTemplate_impl__
+#endif // __XIOS_CAttributeTemplate_impl__
Index: /XIOS/trunk/src/buffer.cpp
===================================================================
--- /XIOS/trunk/src/buffer.cpp	(revision 590)
+++ /XIOS/trunk/src/buffer.cpp	(revision 591)
@@ -1,3 +1,3 @@
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "buffer.hpp"
 
Index: /XIOS/trunk/src/buffer.hpp
===================================================================
--- /XIOS/trunk/src/buffer.hpp	(revision 590)
+++ /XIOS/trunk/src/buffer.hpp	(revision 591)
@@ -3,5 +3,5 @@
 
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 
 namespace xios
Index: /XIOS/trunk/src/buffer_client.cpp
===================================================================
--- /XIOS/trunk/src/buffer_client.cpp	(revision 590)
+++ /XIOS/trunk/src/buffer_client.cpp	(revision 591)
@@ -1,3 +1,3 @@
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "log.hpp"
Index: /XIOS/trunk/src/buffer_client.hpp
===================================================================
--- /XIOS/trunk/src/buffer_client.hpp	(revision 590)
+++ /XIOS/trunk/src/buffer_client.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __BUFFER_CLIENT_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "buffer_out.hpp"
 #include "mpi.hpp"
Index: /XIOS/trunk/src/buffer_in.cpp
===================================================================
--- /XIOS/trunk/src/buffer_in.cpp	(revision 590)
+++ /XIOS/trunk/src/buffer_in.cpp	(revision 591)
@@ -1,3 +1,3 @@
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "buffer_in.hpp"
 
Index: /XIOS/trunk/src/buffer_in.hpp
===================================================================
--- /XIOS/trunk/src/buffer_in.hpp	(revision 590)
+++ /XIOS/trunk/src/buffer_in.hpp	(revision 591)
@@ -3,5 +3,5 @@
 
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 
 namespace xios
Index: /XIOS/trunk/src/buffer_out.cpp
===================================================================
--- /XIOS/trunk/src/buffer_out.cpp	(revision 590)
+++ /XIOS/trunk/src/buffer_out.cpp	(revision 591)
@@ -1,3 +1,3 @@
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "buffer_out.hpp"
 
Index: /XIOS/trunk/src/buffer_out.hpp
===================================================================
--- /XIOS/trunk/src/buffer_out.hpp	(revision 590)
+++ /XIOS/trunk/src/buffer_out.hpp	(revision 591)
@@ -3,5 +3,5 @@
 
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 
 namespace xios
Index: /XIOS/trunk/src/buffer_server.cpp
===================================================================
--- /XIOS/trunk/src/buffer_server.cpp	(revision 590)
+++ /XIOS/trunk/src/buffer_server.cpp	(revision 591)
@@ -1,3 +1,3 @@
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "buffer_server.hpp"
Index: /XIOS/trunk/src/buffer_server.hpp
===================================================================
--- /XIOS/trunk/src/buffer_server.hpp	(revision 590)
+++ /XIOS/trunk/src/buffer_server.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __BUFFER_SERVER_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "buffer.hpp"
 #include "mpi.hpp"
Index: /XIOS/trunk/src/calendar.hpp
===================================================================
--- /XIOS/trunk/src/calendar.hpp	(revision 590)
+++ /XIOS/trunk/src/calendar.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CCalendar__
-#define __XMLIO_CCalendar__
+#ifndef __XIOS_CCalendar__
+#define __XIOS_CCalendar__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "date.hpp"
@@ -123,3 +123,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CCalendar__
+#endif // __XIOS_CCalendar__
Index: /XIOS/trunk/src/calendar_util.hpp
===================================================================
--- /XIOS/trunk/src/calendar_util.hpp	(revision 590)
+++ /XIOS/trunk/src/calendar_util.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CCalendar_util__
-#define __XMLIO_CCalendar_util__
+#ifndef __XIOS_CCalendar_util__
+#define __XIOS_CCalendar_util__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "calendar.hpp"
@@ -38,3 +38,3 @@
 } // namespace xios
 
-#endif //__XMLIO_CCalendar_util__
+#endif //__XIOS_CCalendar_util__
Index: /XIOS/trunk/src/client.cpp
===================================================================
--- /XIOS/trunk/src/client.cpp	(revision 590)
+++ /XIOS/trunk/src/client.cpp	(revision 591)
@@ -1,4 +1,4 @@
 #include "globalScopeData.hpp"
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "cxios.hpp"
 #include "client.hpp"
Index: /XIOS/trunk/src/client.hpp
===================================================================
--- /XIOS/trunk/src/client.hpp	(revision 590)
+++ /XIOS/trunk/src/client.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __CLIENT_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "mpi.hpp"
 
Index: /XIOS/trunk/src/client_server_mapping.hpp
===================================================================
--- /XIOS/trunk/src/client_server_mapping.hpp	(revision 590)
+++ /XIOS/trunk/src/client_server_mapping.hpp	(revision 591)
@@ -10,5 +10,5 @@
 #define __XIOS_CLIENT_SERVER_MAPPING_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "array_new.hpp"
 #include "mpi.hpp"
Index: /XIOS/trunk/src/client_server_mapping_distributed.hpp
===================================================================
--- /XIOS/trunk/src/client_server_mapping_distributed.hpp	(revision 590)
+++ /XIOS/trunk/src/client_server_mapping_distributed.hpp	(revision 591)
@@ -13,5 +13,5 @@
 
 #include <client_server_mapping.hpp>
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "array_new.hpp"
 #include "mpi.hpp"
Index: /XIOS/trunk/src/config/calendar_type.conf
===================================================================
--- /XIOS/trunk/src/config/calendar_type.conf	(revision 590)
+++ /XIOS/trunk/src/config/calendar_type.conf	(revision 591)
@@ -1,19 +1,19 @@
-#ifdef __XMLIO_CAllLeapCalendar__
+#ifdef __XIOS_CAllLeapCalendar__
    DECLARE_CALENDAR(AllLeap, AllLeap)
-#endif //__XMLIO_CAllLeapCalendar__
+#endif //__XIOS_CAllLeapCalendar__
 
-#ifdef __XMLIO_CD360Calendar__
+#ifdef __XIOS_CD360Calendar__
    DECLARE_CALENDAR(D360, D360)
-#endif //__XMLIO_CD360Calendar__
+#endif //__XIOS_CD360Calendar__
 
-#ifdef __XMLIO_CGregorianCalendar__
+#ifdef __XIOS_CGregorianCalendar__
    DECLARE_CALENDAR(Gregorian, Gregorian)
-#endif //__XMLIO_CGregorianCalendar__
+#endif //__XIOS_CGregorianCalendar__
 
-#ifdef __XMLIO_CJulianCalendar__
+#ifdef __XIOS_CJulianCalendar__
    DECLARE_CALENDAR(Julian, Julian)
-#endif //__XMLIO_CJulianCalendar__
+#endif //__XIOS_CJulianCalendar__
 
-#ifdef __XMLIO_CNoLeapCalendar__
+#ifdef __XIOS_CNoLeapCalendar__
    DECLARE_CALENDAR(NoLeap, NoLeap)
-#endif //__XMLIO_CNoLeapCalendar__
+#endif //__XIOS_CNoLeapCalendar__
Index: /XIOS/trunk/src/config/functor_type.conf
===================================================================
--- /XIOS/trunk/src/config/functor_type.conf	(revision 590)
+++ /XIOS/trunk/src/config/functor_type.conf	(revision 591)
@@ -1,25 +1,25 @@
-#ifdef __XMLIO_CAverage__
+#ifdef __XIOS_CAverage__
    DECLARE_FUNCTOR(Average  , average)
-#endif //__XMLIO_CAverage__
+#endif //__XIOS_CAverage__
 
-#ifdef __XMLIO_CAccumulate__
+#ifdef __XIOS_CAccumulate__
    DECLARE_FUNCTOR(Accumulate  , accumulate)
-#endif //__XMLIO_CAccumulate__
+#endif //__XIOS_CAccumulate__
 
-#ifdef __XMLIO_CInstant__
+#ifdef __XIOS_CInstant__
    DECLARE_FUNCTOR(Instant, instant)
-#endif //__XMLIO_CInstant__
+#endif //__XIOS_CInstant__
 
-#ifdef __XMLIO_COnce__
+#ifdef __XIOS_COnce__
    DECLARE_FUNCTOR(Once, once)
-#endif //__XMLIO_COnce__
+#endif //__XIOS_COnce__
 
-#ifdef __XMLIO_CMaximum__
+#ifdef __XIOS_CMaximum__
    DECLARE_FUNCTOR(Maximum , maximum)
-#endif //__XMLIO_CMaximum__
+#endif //__XIOS_CMaximum__
 
-#ifdef __XMLIO_CMinimum__
+#ifdef __XIOS_CMinimum__
    DECLARE_FUNCTOR(Minimum , minimum)
-#endif //__XMLIO_CMinimum__
+#endif //__XIOS_CMinimum__
 
 
Index: /XIOS/trunk/src/config/node_type.conf
===================================================================
--- /XIOS/trunk/src/config/node_type.conf	(revision 590)
+++ /XIOS/trunk/src/config/node_type.conf	(revision 591)
@@ -1,37 +1,37 @@
-#ifdef __XMLIO_CAxis__
+#ifdef __XIOS_CAxis__
    DECLARE_NODE(Axis  , axis  )
-#endif //__XMLIO_CAxis__
+#endif //__XIOS_CAxis__
 
-#ifdef __XMLIO_CDomain__
+#ifdef __XIOS_CDomain__
    DECLARE_NODE(Domain, domain)
-#endif //__XMLIO_CDomain__
+#endif //__XIOS_CDomain__
 
-#ifdef __XMLIO_CField__
+#ifdef __XIOS_CField__
    DECLARE_NODE(Field , field )
-#endif //__XMLIO_CField__
+#endif //__XIOS_CField__
 
-#ifdef __XMLIO_CFile__
+#ifdef __XIOS_CFile__
    DECLARE_NODE(File  , file  )
-#endif //__XMLIO_CFile__
+#endif //__XIOS_CFile__
 
-#ifdef __XMLIO_CGrid__
+#ifdef __XIOS_CGrid__
    DECLARE_NODE(Grid  , grid  )
-#endif //__XMLIO_CGrid__
+#endif //__XIOS_CGrid__
 
-//#ifdef __XMLIO_CMethod__
+//#ifdef __XIOS_CMethod__
 //   DECLARE_NODE(Method, method)
-//#endif //__XMLIO_CMethod__
+//#endif //__XIOS_CMethod__
 
-#ifdef __XMLIO_CVariable__
+#ifdef __XIOS_CVariable__
    DECLARE_NODE(Variable, variable)
-#endif //__XMLIO_CVariable__
+#endif //__XIOS_CVariable__
 
-#ifdef __XMLIO_CCalendarWrapper__
+#ifdef __XIOS_CCalendarWrapper__
    DECLARE_NODE(CalendarWrapper, calendarwrapper)
-#endif //__XMLIO_CCalendarWrapper__
+#endif //__XIOS_CCalendarWrapper__
 
-#ifdef __XMLIO_CContext__
+#ifdef __XIOS_CContext__
    DECLARE_NODE_PAR(Context, context)
-#endif //__XMLIO_CContext__
+#endif //__XIOS_CContext__
 
 #undef DECLARE_NODE
Index: /XIOS/trunk/src/configure.cpp
===================================================================
--- /XIOS/trunk/src/configure.cpp	(revision 590)
+++ /XIOS/trunk/src/configure.cpp	(revision 591)
@@ -1,6 +1,6 @@
-#define __XMLIO_Configure__ // < Ne pas supprimer
+#define __XIOS_Configure__ // < Ne pas supprimer
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 
 /// /////////// Macros /////////// ///
Index: /XIOS/trunk/src/configure.hpp
===================================================================
--- /XIOS/trunk/src/configure.hpp	(revision 590)
+++ /XIOS/trunk/src/configure.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_Configure__
-#define __XMLIO_Configure__
+#ifndef __XIOS_Configure__
+#define __XIOS_Configure__
 
 
@@ -12,3 +12,3 @@
 } // namespace xios
 
-#endif // __XMLIO_Configure__
+#endif // __XIOS_Configure__
Index: /XIOS/trunk/src/context_client.cpp
===================================================================
--- /XIOS/trunk/src/context_client.cpp	(revision 590)
+++ /XIOS/trunk/src/context_client.cpp	(revision 591)
@@ -1,3 +1,3 @@
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "context_client.hpp"
 #include "context_server.hpp"
Index: /XIOS/trunk/src/context_client.hpp
===================================================================
--- /XIOS/trunk/src/context_client.hpp	(revision 590)
+++ /XIOS/trunk/src/context_client.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __CONTEXT_CLIENT_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "buffer_out.hpp"
 #include "buffer_client.hpp"
Index: /XIOS/trunk/src/context_server.hpp
===================================================================
--- /XIOS/trunk/src/context_server.hpp	(revision 590)
+++ /XIOS/trunk/src/context_server.hpp	(revision 591)
@@ -1,5 +1,5 @@
 #ifndef __CONTEXT_SERVER_HPP__
 #define __CONTEXT_SERVER_HPP__
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "event_server.hpp"
 #include "buffer_server.hpp"
Index: /XIOS/trunk/src/cxios.cpp
===================================================================
--- /XIOS/trunk/src/cxios.cpp	(revision 590)
+++ /XIOS/trunk/src/cxios.cpp	(revision 591)
@@ -1,4 +1,4 @@
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "cxios.hpp"
 #include "client.hpp"
Index: /XIOS/trunk/src/cxios.hpp
===================================================================
--- /XIOS/trunk/src/cxios.hpp	(revision 590)
+++ /XIOS/trunk/src/cxios.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __XIOS_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "mpi.hpp"
 
Index: /XIOS/trunk/src/cxios_decl.cpp
===================================================================
--- /XIOS/trunk/src/cxios_decl.cpp	(revision 590)
+++ /XIOS/trunk/src/cxios_decl.cpp	(revision 591)
@@ -1,4 +1,4 @@
 #include "cxios_impl.hpp"
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include <string>
 
Index: /XIOS/trunk/src/cxios_impl.hpp
===================================================================
--- /XIOS/trunk/src/cxios_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/cxios_impl.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __XIOS_IMPL_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "variable.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/data_output.hpp
===================================================================
--- /XIOS/trunk/src/data_output.hpp	(revision 590)
+++ /XIOS/trunk/src/data_output.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_DATA_OUTPUT__
-#define __XMLIO_DATA_OUTPUT__
+#ifndef __XIOS_DATA_OUTPUT__
+#define __XIOS_DATA_OUTPUT__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "grid.hpp"
@@ -66,3 +66,3 @@
 } // namespace xios
 
-#endif //__XMLIO_DATA_OUTPUT__
+#endif //__XIOS_DATA_OUTPUT__
Index: /XIOS/trunk/src/date.hpp
===================================================================
--- /XIOS/trunk/src/date.hpp	(revision 590)
+++ /XIOS/trunk/src/date.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CDate__
-#define __XMLIO_CDate__
+#ifndef __XIOS_CDate__
+#define __XIOS_CDate__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "duration.hpp"
@@ -101,3 +101,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CDate__
+#endif // __XIOS_CDate__
Index: /XIOS/trunk/src/date/allleap.cpp
===================================================================
--- /XIOS/trunk/src/date/allleap.cpp	(revision 590)
+++ /XIOS/trunk/src/date/allleap.cpp	(revision 591)
@@ -46,4 +46,4 @@
 
       ///--------------------------------------------------------------
-} // namespace xmlioserver
+} // namespace xios
 
Index: /XIOS/trunk/src/date/allleap.hpp
===================================================================
--- /XIOS/trunk/src/date/allleap.hpp	(revision 590)
+++ /XIOS/trunk/src/date/allleap.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CAllLeapCalendar__
-#define __XMLIO_CAllLeapCalendar__
+#ifndef __XIOS_CAllLeapCalendar__
+#define __XIOS_CAllLeapCalendar__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "calendar.hpp"
 
@@ -35,5 +35,5 @@
       }; // class CAllLeapCalendar
 
-} // namespace xmlioserver
+} // namespace xios
 
-#endif // __XMLIO_CAllLeapCalendar__
+#endif // __XIOS_CAllLeapCalendar__
Index: /XIOS/trunk/src/date/calendar_type.hpp
===================================================================
--- /XIOS/trunk/src/date/calendar_type.hpp	(revision 590)
+++ /XIOS/trunk/src/date/calendar_type.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_calendar_type__
-#define __XMLIO_calendar_type__
+#ifndef __XIOS_calendar_type__
+#define __XIOS_calendar_type__
 
 #include "allleap.hpp"
@@ -9,3 +9,3 @@
 #include "user_defined.hpp"
 
-#endif //__XMLIO_calendar_type__
+#endif //__XIOS_calendar_type__
Index: /XIOS/trunk/src/date/d360.cpp
===================================================================
--- /XIOS/trunk/src/date/d360.cpp	(revision 590)
+++ /XIOS/trunk/src/date/d360.cpp	(revision 591)
@@ -43,4 +43,4 @@
 
       ///--------------------------------------------------------------
-} // namespace xmlioserver
+} // namespace xios
 
Index: /XIOS/trunk/src/date/d360.hpp
===================================================================
--- /XIOS/trunk/src/date/d360.hpp	(revision 590)
+++ /XIOS/trunk/src/date/d360.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CD360Calendar__
-#define __XMLIO_CD360Calendar__
+#ifndef __XIOS_CD360Calendar__
+#define __XIOS_CD360Calendar__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "calendar.hpp"
 
@@ -35,6 +35,6 @@
       }; // class CD360Calendar
 
-} // namespace xmlioserver
+} // namespace xios
 
-#endif // __XMLIO_CD360Calendar__
+#endif // __XIOS_CD360Calendar__
 
Index: /XIOS/trunk/src/date/gregorian.cpp
===================================================================
--- /XIOS/trunk/src/date/gregorian.cpp	(revision 590)
+++ /XIOS/trunk/src/date/gregorian.cpp	(revision 591)
@@ -61,4 +61,4 @@
 
       ///--------------------------------------------------------------
-} // namespace xmlioserver
+} // namespace xios
 
Index: /XIOS/trunk/src/date/gregorian.hpp
===================================================================
--- /XIOS/trunk/src/date/gregorian.hpp	(revision 590)
+++ /XIOS/trunk/src/date/gregorian.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CGregorianCalendar__
-#define __XMLIO_CGregorianCalendar__
+#ifndef __XIOS_CGregorianCalendar__
+#define __XIOS_CGregorianCalendar__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "calendar.hpp"
 
@@ -37,5 +37,5 @@
       }; // class CGregorianCalendar
 
-} // namespace xmlioserver
+} // namespace xios
 
-#endif // __XMLIO_CGregorianCalendar__
+#endif // __XIOS_CGregorianCalendar__
Index: /XIOS/trunk/src/date/julian.cpp
===================================================================
--- /XIOS/trunk/src/date/julian.cpp	(revision 590)
+++ /XIOS/trunk/src/date/julian.cpp	(revision 591)
@@ -55,3 +55,3 @@
 
       ///--------------------------------------------------------------
-} // namespace xmlioserver
+} // namespace xios
Index: /XIOS/trunk/src/date/julian.hpp
===================================================================
--- /XIOS/trunk/src/date/julian.hpp	(revision 590)
+++ /XIOS/trunk/src/date/julian.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CJulianCalendar__
-#define __XMLIO_CJulianCalendar__
+#ifndef __XIOS_CJulianCalendar__
+#define __XIOS_CJulianCalendar__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "calendar.hpp"
 
@@ -37,5 +37,5 @@
       }; // class CJulianCalendar
 
-} // namespace xmlioserver
+} // namespace xios
 
-#endif // __XMLIO_CJulianCalendar__
+#endif // __XIOS_CJulianCalendar__
Index: /XIOS/trunk/src/date/noleap.cpp
===================================================================
--- /XIOS/trunk/src/date/noleap.cpp	(revision 590)
+++ /XIOS/trunk/src/date/noleap.cpp	(revision 591)
@@ -39,4 +39,4 @@
 
       ///--------------------------------------------------------------
-} // namespace xmlioserver
+} // namespace xios
 
Index: /XIOS/trunk/src/date/noleap.hpp
===================================================================
--- /XIOS/trunk/src/date/noleap.hpp	(revision 590)
+++ /XIOS/trunk/src/date/noleap.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CNoLeapCalendar__
-#define __XMLIO_CNoLeapCalendar__
+#ifndef __XIOS_CNoLeapCalendar__
+#define __XIOS_CNoLeapCalendar__
 
-/// xmlioserver headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "calendar.hpp"
 
@@ -33,6 +33,6 @@
       }; // class CNoLeapCalendar
 
-} // namespace xmlioserver
+} // namespace xios
 
-#endif // __XMLIO_CNoLeapCalendar__
+#endif // __XIOS_CNoLeapCalendar__
 
Index: /XIOS/trunk/src/date/user_defined.cpp
===================================================================
--- /XIOS/trunk/src/date/user_defined.cpp	(revision 590)
+++ /XIOS/trunk/src/date/user_defined.cpp	(revision 591)
@@ -265,4 +265,4 @@
     return isValid;
   }
-} // namespace xmlioserver
-
+} // namespace xios
+
Index: /XIOS/trunk/src/date/user_defined.hpp
===================================================================
--- /XIOS/trunk/src/date/user_defined.hpp	(revision 590)
+++ /XIOS/trunk/src/date/user_defined.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CUserDefinedCalendar__
-#define __XMLIO_CUserDefinedCalendar__
+#ifndef __XIOS_CUserDefinedCalendar__
+#define __XIOS_CUserDefinedCalendar__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "calendar.hpp"
 #include "array_new.hpp"
@@ -69,5 +69,5 @@
   }; // class CUserDefinedCalendar
 
-} // namespace xmlioserver
+} // namespace xios
 
-#endif // __XMLIO_CUserDefinedCalendar__
+#endif // __XIOS_CUserDefinedCalendar__
Index: /XIOS/trunk/src/declare_attribute.hpp
===================================================================
--- /XIOS/trunk/src/declare_attribute.hpp	(revision 590)
+++ /XIOS/trunk/src/declare_attribute.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_DECLARE_ATTRIBUTE__
-#define __XMLIO_DECLARE_ATTRIBUTE__
+#ifndef __XIOS_DECLARE_ATTRIBUTE__
+#define __XIOS_DECLARE_ATTRIBUTE__
 
 /// ///////////////////////////// Macros ///////////////////////////// ///
@@ -137,3 +137,3 @@
    };
 
-#endif // __XMLIO_DECLARE_ATTRIBUTE__
+#endif // __XIOS_DECLARE_ATTRIBUTE__
Index: /XIOS/trunk/src/declare_group.hpp
===================================================================
--- /XIOS/trunk/src/declare_group.hpp	(revision 590)
+++ /XIOS/trunk/src/declare_group.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_DECLARE_GROUP__
-#define __XMLIO_DECLARE_GROUP__
+#ifndef __XIOS_DECLARE_GROUP__
+#define __XIOS_DECLARE_GROUP__
 
 /// ///////////////////////////// Macros ///////////////////////////// ///
@@ -56,3 +56,3 @@
    typedef type##Group type##Definition
 
-#endif // __XMLIO_DECLARE_GROUP__
+#endif // __XIOS_DECLARE_GROUP__
Index: /XIOS/trunk/src/distribution.hpp
===================================================================
--- /XIOS/trunk/src/distribution.hpp	(revision 590)
+++ /XIOS/trunk/src/distribution.hpp	(revision 591)
@@ -10,5 +10,5 @@
 #define __XIOS_DISTRIBUTION_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "array_new.hpp"
 
Index: /XIOS/trunk/src/duration.hpp
===================================================================
--- /XIOS/trunk/src/duration.hpp	(revision 590)
+++ /XIOS/trunk/src/duration.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CDuration__
-#define __XMLIO_CDuration__
+#ifndef __XIOS_CDuration__
+#define __XIOS_CDuration__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 
@@ -45,3 +45,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CDuration__
+#endif // __XIOS_CDuration__
Index: /XIOS/trunk/src/event_client.cpp
===================================================================
--- /XIOS/trunk/src/event_client.cpp	(revision 590)
+++ /XIOS/trunk/src/event_client.cpp	(revision 591)
@@ -1,3 +1,3 @@
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "event_client.hpp"
 #include "buffer_out.hpp"
Index: /XIOS/trunk/src/event_client.hpp
===================================================================
--- /XIOS/trunk/src/event_client.hpp	(revision 590)
+++ /XIOS/trunk/src/event_client.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __EVENT_CLIENT_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "buffer_out.hpp"
 #include "message.hpp"
Index: /XIOS/trunk/src/event_scheduler.cpp
===================================================================
--- /XIOS/trunk/src/event_scheduler.cpp	(revision 590)
+++ /XIOS/trunk/src/event_scheduler.cpp	(revision 591)
@@ -1,4 +1,4 @@
 #include "event_scheduler.hpp"
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "mpi.hpp"
 
Index: /XIOS/trunk/src/event_scheduler.hpp
===================================================================
--- /XIOS/trunk/src/event_scheduler.hpp	(revision 590)
+++ /XIOS/trunk/src/event_scheduler.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __EVENT_SCHEDULER_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "mpi.hpp"
 
Index: /XIOS/trunk/src/event_server.cpp
===================================================================
--- /XIOS/trunk/src/event_server.cpp	(revision 590)
+++ /XIOS/trunk/src/event_server.cpp	(revision 591)
@@ -1,3 +1,3 @@
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "buffer_in.hpp"
 #include "type.hpp"
Index: /XIOS/trunk/src/event_server.hpp
===================================================================
--- /XIOS/trunk/src/event_server.hpp	(revision 590)
+++ /XIOS/trunk/src/event_server.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __EVENT_SERVER_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "buffer_in.hpp"
 #include "buffer_server.hpp"
Index: /XIOS/trunk/src/exception.hpp
===================================================================
--- /XIOS/trunk/src/exception.hpp	(revision 590)
+++ /XIOS/trunk/src/exception.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CException__
-#define __XMLIO_CException__
+#ifndef __XIOS_CException__
+#define __XIOS_CException__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "object.hpp"
 
@@ -54,3 +54,3 @@
 #define ERROR(id, x)  CException(id).getStream() << INFO(x)
 
-#endif // __XMLIO_CException__
+#endif // __XIOS_CException__
Index: /XIOS/trunk/src/functor.hpp
===================================================================
--- /XIOS/trunk/src/functor.hpp	(revision 590)
+++ /XIOS/trunk/src/functor.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CFunctor__
-#define __XMLIO_CFunctor__
+#ifndef __XIOS_CFunctor__
+#define __XIOS_CFunctor__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "array_new.hpp"
@@ -60,3 +60,3 @@
 //#include "functor_type.hpp"
 
-#endif // __XMLIO_CFunctor__
+#endif // __XIOS_CFunctor__
Index: /XIOS/trunk/src/functor/accumulate.cpp
===================================================================
--- /XIOS/trunk/src/functor/accumulate.cpp	(revision 590)
+++ /XIOS/trunk/src/functor/accumulate.cpp	(revision 591)
@@ -49,3 +49,3 @@
       }
    } // namespace func
-} // namespace xmlioserver
+} // namespace xios
Index: /XIOS/trunk/src/functor/accumulate.hpp
===================================================================
--- /XIOS/trunk/src/functor/accumulate.hpp	(revision 590)
+++ /XIOS/trunk/src/functor/accumulate.hpp	(revision 591)
@@ -1,6 +1,6 @@
-#ifndef __XMLIO_CAccumulate__
-#define __XMLIO_CAccumulate__
+#ifndef __XIOS_CAccumulate__
+#define __XIOS_CAccumulate__
 
-/// xmlioserver headers ///
+/// XIOS headers ///
 #include "functor.hpp"
 #include "array_new.hpp"
@@ -37,5 +37,5 @@
 
    } // namespace func
-} // namespace xmlioserver
+} // namespace xios
 
-#endif //__XMLIO_CAccumulate__
+#endif //__XIOS_CAccumulate__
Index: /XIOS/trunk/src/functor/average.cpp
===================================================================
--- /XIOS/trunk/src/functor/average.cpp	(revision 590)
+++ /XIOS/trunk/src/functor/average.cpp	(revision 591)
@@ -86,3 +86,3 @@
       }
    } // namespace func
-} // namespace xmlioserver
+} // namespace xios
Index: /XIOS/trunk/src/functor/average.hpp
===================================================================
--- /XIOS/trunk/src/functor/average.hpp	(revision 590)
+++ /XIOS/trunk/src/functor/average.hpp	(revision 591)
@@ -1,6 +1,6 @@
-#ifndef __XMLIO_CAverage__
-#define __XMLIO_CAverage__
+#ifndef __XIOS_CAverage__
+#define __XIOS_CAverage__
 
-/// xmlioserver headers ///
+/// XIOS headers ///
 #include "functor.hpp"
 #include "array_new.hpp"
@@ -37,5 +37,5 @@
 
    } // namespace func
-} // namespace xmlioserver
+} // namespace xios
 
-#endif //__XMLIO_CAverage__
+#endif //__XIOS_CAverage__
Index: /XIOS/trunk/src/functor/functor_type.hpp
===================================================================
--- /XIOS/trunk/src/functor/functor_type.hpp	(revision 590)
+++ /XIOS/trunk/src/functor/functor_type.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_functor_type__
-#define __XMLIO_functor_type__
+#ifndef __XIOS_functor_type__
+#define __XIOS_functor_type__
 
 #include "average.hpp"
@@ -9,4 +9,4 @@
 #include "minimum.hpp"
 
-#endif //__XMLIO_functor_type__
+#endif //__XIOS_functor_type__
 
Index: /XIOS/trunk/src/functor/instant.cpp
===================================================================
--- /XIOS/trunk/src/functor/instant.cpp	(revision 590)
+++ /XIOS/trunk/src/functor/instant.cpp	(revision 591)
@@ -34,3 +34,3 @@
 
    } // namespace func
-} // namespace xmlioserver
+} // namespace xios
Index: /XIOS/trunk/src/functor/instant.hpp
===================================================================
--- /XIOS/trunk/src/functor/instant.hpp	(revision 590)
+++ /XIOS/trunk/src/functor/instant.hpp	(revision 591)
@@ -1,6 +1,6 @@
-#ifndef __XMLIO_CInstant__
-#define __XMLIO_CInstant__
+#ifndef __XIOS_CInstant__
+#define __XIOS_CInstant__
 
-/// xios headers ///
+/// XIOS headers ///
 #include "functor.hpp"
 #include "array_new.hpp"
@@ -36,5 +36,5 @@
 
    } // namespace func
-} // namespace xmlioserver
+} // namespace xios
 
-#endif //__XMLIO_CInstant__
+#endif //__XIOS_CInstant__
Index: /XIOS/trunk/src/functor/maximum.cpp
===================================================================
--- /XIOS/trunk/src/functor/maximum.cpp	(revision 590)
+++ /XIOS/trunk/src/functor/maximum.cpp	(revision 591)
@@ -50,3 +50,3 @@
 
    } // namespace func
-} // namespace xmlioserver
+} // namespace xios
Index: /XIOS/trunk/src/functor/maximum.hpp
===================================================================
--- /XIOS/trunk/src/functor/maximum.hpp	(revision 590)
+++ /XIOS/trunk/src/functor/maximum.hpp	(revision 591)
@@ -1,6 +1,6 @@
-#ifndef __XMLIO_CMaximum__
-#define __XMLIO_CMaximum__
+#ifndef __XIOS_CMaximum__
+#define __XIOS_CMaximum__
 
-/// xios headers ///
+/// XIOS headers ///
 #include "functor.hpp"
 #include "array_new.hpp"
@@ -36,5 +36,5 @@
 
    } // namespace func
-} // namespace xmlioserver
+} // namespace xios
 
-#endif //__XMLIO_CMaximum__
+#endif //__XIOS_CMaximum__
Index: /XIOS/trunk/src/functor/minimum.cpp
===================================================================
--- /XIOS/trunk/src/functor/minimum.cpp	(revision 590)
+++ /XIOS/trunk/src/functor/minimum.cpp	(revision 591)
@@ -49,3 +49,3 @@
 
    } // namespace func
-} // namespace xmlioserver
+} // namespace xios
Index: /XIOS/trunk/src/functor/minimum.hpp
===================================================================
--- /XIOS/trunk/src/functor/minimum.hpp	(revision 590)
+++ /XIOS/trunk/src/functor/minimum.hpp	(revision 591)
@@ -1,6 +1,6 @@
-#ifndef __XMLIO_CMinimum__
-#define __XMLIO_CMinimum__
+#ifndef __XIOS_CMinimum__
+#define __XIOS_CMinimum__
 
-/// xmlioserver headers ///
+/// XIOS headers ///
 #include "functor.hpp"
 #include "array_new.hpp"
@@ -36,5 +36,5 @@
 
    } // namespace func
-} // namespace xmlioserver
+} // namespace xios
 
-#endif //__XMLIO_CMinimum__
+#endif //__XIOS_CMinimum__
Index: /XIOS/trunk/src/functor/once.cpp
===================================================================
--- /XIOS/trunk/src/functor/once.cpp	(revision 590)
+++ /XIOS/trunk/src/functor/once.cpp	(revision 591)
@@ -34,4 +34,4 @@
 
    } // namespace func
-} // namespace xmlioserver
+} // namespace xios
 
Index: /XIOS/trunk/src/functor/once.hpp
===================================================================
--- /XIOS/trunk/src/functor/once.hpp	(revision 590)
+++ /XIOS/trunk/src/functor/once.hpp	(revision 591)
@@ -1,6 +1,6 @@
-#ifndef __XMLIO_COnce__
-#define __XMLIO_COnce__
+#ifndef __XIOS_COnce__
+#define __XIOS_COnce__
 
-/// xios headers ///
+/// XIOS headers ///
 #include "functor.hpp"
 #include "array_new.hpp"
@@ -37,4 +37,4 @@
 } // namespace xios
 
-#endif //__XMLIO_COnce__
+#endif //__XIOS_COnce__
 
Index: /XIOS/trunk/src/generate_fortran_interface.cpp
===================================================================
--- /XIOS/trunk/src/generate_fortran_interface.cpp	(revision 590)
+++ /XIOS/trunk/src/generate_fortran_interface.cpp	(revision 591)
@@ -1,3 +1,3 @@
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "generate_interface.hpp"
 #include "indent.hpp"
Index: /XIOS/trunk/src/generate_interface.hpp
===================================================================
--- /XIOS/trunk/src/generate_interface.hpp	(revision 590)
+++ /XIOS/trunk/src/generate_interface.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define  __XIOS_GENERATE_INTERFACE_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 
 namespace xios
Index: /XIOS/trunk/src/generate_interface_impl.hpp
===================================================================
--- /XIOS/trunk/src/generate_interface_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/generate_interface_impl.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __XIOS_GENERATE_INTERFACE_IMPL_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "generate_interface.hpp"
 #include "type_util.hpp"
Index: /XIOS/trunk/src/group_factory.hpp
===================================================================
--- /XIOS/trunk/src/group_factory.hpp	(revision 590)
+++ /XIOS/trunk/src/group_factory.hpp	(revision 591)
@@ -1,10 +1,10 @@
-#ifndef __XMLIO_CGroupFactory__
-#define __XMLIO_CGroupFactory__
+#ifndef __XIOS_CGroupFactory__
+#define __XIOS_CGroupFactory__
 
 /// boost headers ///
 #include <boost/shared_ptr.hpp>
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "object_factory.hpp"
@@ -77,3 +77,3 @@
 //#include "group_parser.hpp"
 
-#endif // __XMLIO_CGroupFactory__
+#endif // __XIOS_CGroupFactory__
Index: /XIOS/trunk/src/group_factory_impl.hpp
===================================================================
--- /XIOS/trunk/src/group_factory_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/group_factory_impl.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_CGroupFactory_impl__
-#define __XMLIO_CGroupFactory_impl__
+#ifndef __XIOS_CGroupFactory_impl__
+#define __XIOS_CGroupFactory_impl__
 
 #include "group_factory.hpp"
@@ -138,3 +138,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CGroupFactory_impl__
+#endif // __XIOS_CGroupFactory_impl__
Index: /XIOS/trunk/src/group_parser.hpp
===================================================================
--- /XIOS/trunk/src/group_parser.hpp	(revision 590)
+++ /XIOS/trunk/src/group_parser.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_GroupParser__
-#define __XMLIO_GroupParser__
+#ifndef __XIOS_GroupParser__
+#define __XIOS_GroupParser__
 
 /// boost headers ///
@@ -125,3 +125,3 @@
 } // namespace xios
 
-#endif // __XMLIO_GroupParser__
+#endif // __XIOS_GroupParser__
Index: /XIOS/trunk/src/group_template.hpp
===================================================================
--- /XIOS/trunk/src/group_template.hpp	(revision 590)
+++ /XIOS/trunk/src/group_template.hpp	(revision 591)
@@ -1,6 +1,6 @@
-#ifndef __XMLIO_CGroupTemplate__
-#define __XMLIO_CGroupTemplate__
+#ifndef __XIOS_CGroupTemplate__
+#define __XIOS_CGroupTemplate__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "declare_attribute.hpp"
 #include "event_server.hpp"
@@ -104,3 +104,3 @@
 //#include "group_template_impl.hpp"
 
-#endif // __XMLIO_CGroupTemplate__
+#endif // __XIOS_CGroupTemplate__
Index: /XIOS/trunk/src/group_template_impl.hpp
===================================================================
--- /XIOS/trunk/src/group_template_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/group_template_impl.hpp	(revision 591)
@@ -1,6 +1,6 @@
-#ifndef __XMLIO_CGroupTemplate_impl__
-#define __XMLIO_CGroupTemplate_impl__
-
-#include "xmlioserver_spl.hpp"
+#ifndef __XIOS_CGroupTemplate_impl__
+#define __XIOS_CGroupTemplate_impl__
+
+#include "xios_spl.hpp"
 #include "event_server.hpp"
 #include "object_template.hpp"
@@ -592,3 +592,3 @@
 
 
-#endif // __XMLIO_CGroupTemplate_impl__
+#endif // __XIOS_CGroupTemplate_impl__
Index: /XIOS/trunk/src/indent_xml.hpp
===================================================================
--- /XIOS/trunk/src/indent_xml.hpp	(revision 590)
+++ /XIOS/trunk/src/indent_xml.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CIndent_XML__
-#define __XMLIO_CIndent_XML__
+#ifndef __XIOS_CIndent_XML__
+#define __XIOS_CIndent_XML__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "xml_node.hpp"
 
@@ -48,3 +48,3 @@
 #define DecEndl   CIndent::DecEndl
 
-#endif // __XMLIO_CIndent__
+#endif // __XIOS_CIndent__
Index: /XIOS/trunk/src/input/inetcdf4.hpp
===================================================================
--- /XIOS/trunk/src/input/inetcdf4.hpp	(revision 590)
+++ /XIOS/trunk/src/input/inetcdf4.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_INETCDF4__
-#define __XMLIO_INETCDF4__
-
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+#ifndef __XIOS_INETCDF4__
+#define __XIOS_INETCDF4__
+
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "array_new.hpp"
@@ -231,5 +231,5 @@
       ///--------------------------------------------------------------
 
-} // namespace xmlioserver
-
-#endif //__XMLIO_INETCDF4__
+} // namespace xios
+
+#endif //__XIOS_INETCDF4__
Index: /XIOS/trunk/src/input/nc4_data_input.hpp
===================================================================
--- /XIOS/trunk/src/input/nc4_data_input.hpp	(revision 590)
+++ /XIOS/trunk/src/input/nc4_data_input.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_NC4_DATA_INPUT__
-#define __XMLIO_NC4_DATA_INPUT__
+#ifndef __XIOS_NC4_DATA_INPUT__
+#define __XIOS_NC4_DATA_INPUT__
 
-/// xmlioserver headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "inetcdf4.hpp"
 
@@ -26,3 +26,3 @@
 } // namespace xios
 
-#endif //__XMLIO_NC4_DATA_INPUT__
+#endif //__XIOS_NC4_DATA_INPUT__
Index: /XIOS/trunk/src/interface/c/icaxis.cpp
===================================================================
--- /XIOS/trunk/src/interface/c/icaxis.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c/icaxis.cpp	(revision 591)
@@ -6,5 +6,5 @@
 #include <boost/shared_ptr.hpp>
 
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c/iccalendar.cpp
===================================================================
--- /XIOS/trunk/src/interface/c/iccalendar.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c/iccalendar.cpp	(revision 591)
@@ -1,3 +1,3 @@
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 
 #include "icdate.hpp"
Index: /XIOS/trunk/src/interface/c/iccalendar_wrapper.cpp
===================================================================
--- /XIOS/trunk/src/interface/c/iccalendar_wrapper.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c/iccalendar_wrapper.cpp	(revision 591)
@@ -6,5 +6,5 @@
 #include <boost/shared_ptr.hpp>
 
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 
 #include "attribute_template.hpp"
Index: /XIOS/trunk/src/interface/c/iccontext.cpp
===================================================================
--- /XIOS/trunk/src/interface/c/iccontext.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c/iccontext.cpp	(revision 591)
@@ -6,5 +6,5 @@
 #include <boost/shared_ptr.hpp>
 
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 
 #include "attribute_template.hpp"
Index: /XIOS/trunk/src/interface/c/icdata.cpp
===================================================================
--- /XIOS/trunk/src/interface/c/icdata.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c/icdata.cpp	(revision 591)
@@ -10,5 +10,5 @@
 
 
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "oasis_cinterface.hpp"
 
Index: /XIOS/trunk/src/interface/c/icdate.cpp
===================================================================
--- /XIOS/trunk/src/interface/c/icdate.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c/icdate.cpp	(revision 591)
@@ -6,5 +6,5 @@
 #include <boost/shared_ptr.hpp>
 
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 
 #include "attribute_template.hpp"
Index: /XIOS/trunk/src/interface/c/icdomain.cpp
===================================================================
--- /XIOS/trunk/src/interface/c/icdomain.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c/icdomain.cpp	(revision 591)
@@ -6,5 +6,5 @@
 #include <boost/shared_ptr.hpp>
 
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 
 #include "attribute_template.hpp"
Index: /XIOS/trunk/src/interface/c/icfield.cpp
===================================================================
--- /XIOS/trunk/src/interface/c/icfield.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c/icfield.cpp	(revision 591)
@@ -6,5 +6,5 @@
 #include <boost/shared_ptr.hpp>
 
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 
 #include "attribute_template.hpp"
Index: /XIOS/trunk/src/interface/c/icfile.cpp
===================================================================
--- /XIOS/trunk/src/interface/c/icfile.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c/icfile.cpp	(revision 591)
@@ -6,5 +6,5 @@
 #include <boost/shared_ptr.hpp>
 
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 
 #include "attribute_template.hpp"
Index: /XIOS/trunk/src/interface/c/icgrid.cpp
===================================================================
--- /XIOS/trunk/src/interface/c/icgrid.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c/icgrid.cpp	(revision 591)
@@ -6,5 +6,5 @@
 #include <boost/shared_ptr.hpp>
 
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 
 #include "attribute_template.hpp"
Index: /XIOS/trunk/src/interface/c/icvariable.cpp
===================================================================
--- /XIOS/trunk/src/interface/c/icvariable.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c/icvariable.cpp	(revision 591)
@@ -6,5 +6,5 @@
 #include <boost/shared_ptr.hpp>
 
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c/icxml_tree.cpp
===================================================================
--- /XIOS/trunk/src/interface/c/icxml_tree.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c/icxml_tree.cpp	(revision 591)
@@ -6,5 +6,5 @@
 #include <boost/shared_ptr.hpp>
 
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 
 #include "attribute_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/icaxisgroup_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/icaxisgroup_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/icaxisgroup_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/iccalendar_wrapper_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/iccalendar_wrapper_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/iccalendar_wrapper_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/iccontext_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/iccontext_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/iccontext_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/icfield_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/icfield_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/icfield_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/icfieldgroup_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/icfieldgroup_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/icfieldgroup_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/icfile_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/icfile_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/icfile_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/icvariable_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/icvariable_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/icvariable_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/interface/c_attr/icvariablegroup_attr.cpp
===================================================================
--- /XIOS/trunk/src/interface/c_attr/icvariablegroup_attr.cpp	(revision 590)
+++ /XIOS/trunk/src/interface/c_attr/icvariablegroup_attr.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "object_template.hpp"
Index: /XIOS/trunk/src/node/axis.cpp
===================================================================
--- /XIOS/trunk/src/node/axis.cpp	(revision 590)
+++ /XIOS/trunk/src/node/axis.cpp	(revision 591)
@@ -8,5 +8,5 @@
 #include "context.hpp"
 #include "context_client.hpp"
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 
 namespace xios {
Index: /XIOS/trunk/src/node/axis.hpp
===================================================================
--- /XIOS/trunk/src/node/axis.hpp	(revision 590)
+++ /XIOS/trunk/src/node/axis.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CAxis__
-#define __XMLIO_CAxis__
+#ifndef __XIOS_CAxis__
+#define __XIOS_CAxis__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "group_factory.hpp"
 
@@ -111,3 +111,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CAxis__
+#endif // __XIOS_CAxis__
Index: /XIOS/trunk/src/node/calendar_wrapper.hpp
===================================================================
--- /XIOS/trunk/src/node/calendar_wrapper.hpp	(revision 590)
+++ /XIOS/trunk/src/node/calendar_wrapper.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CCalendarWrapper__
-#define __XMLIO_CCalendarWrapper__
+#ifndef __XIOS_CCalendarWrapper__
+#define __XIOS_CCalendarWrapper__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "attribute_enum.hpp"
 #include "attribute_enum_impl.hpp"
@@ -85,3 +85,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CCalendarWrapper__
+#endif // __XIOS_CCalendarWrapper__
Index: /XIOS/trunk/src/node/context.cpp
===================================================================
--- /XIOS/trunk/src/node/context.cpp	(revision 590)
+++ /XIOS/trunk/src/node/context.cpp	(revision 591)
@@ -13,5 +13,5 @@
 #include "message.hpp"
 #include "type.hpp"
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 
 namespace xios {
Index: /XIOS/trunk/src/node/context.hpp
===================================================================
--- /XIOS/trunk/src/node/context.hpp	(revision 590)
+++ /XIOS/trunk/src/node/context.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CContext__
-#define __XMLIO_CContext__
-
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+#ifndef __XIOS_CContext__
+#define __XIOS_CContext__
+
+/// XIOS headers ///
+#include "xios_spl.hpp"
 //#include "node_type.hpp"
 #include "calendar_wrapper.hpp"
@@ -227,3 +227,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CContext__
+#endif // __XIOS_CContext__
Index: /XIOS/trunk/src/node/domain.cpp
===================================================================
--- /XIOS/trunk/src/node/domain.cpp	(revision 590)
+++ /XIOS/trunk/src/node/domain.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include "group_template.hpp"
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "event_client.hpp"
 #include "event_server.hpp"
Index: /XIOS/trunk/src/node/domain.hpp
===================================================================
--- /XIOS/trunk/src/node/domain.hpp	(revision 590)
+++ /XIOS/trunk/src/node/domain.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CDomain__
-#define __XMLIO_CDomain__
+#ifndef __XIOS_CDomain__
+#define __XIOS_CDomain__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "group_factory.hpp"
 
@@ -171,3 +171,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CDomain__
+#endif // __XIOS_CDomain__
Index: /XIOS/trunk/src/node/field.cpp
===================================================================
--- /XIOS/trunk/src/node/field.cpp	(revision 590)
+++ /XIOS/trunk/src/node/field.cpp	(revision 591)
@@ -8,5 +8,5 @@
 #include "calendar_util.hpp"
 #include "message.hpp"
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "type.hpp"
 #include "context_client.hpp"
Index: /XIOS/trunk/src/node/field.hpp
===================================================================
--- /XIOS/trunk/src/node/field.hpp	(revision 590)
+++ /XIOS/trunk/src/node/field.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CField__
-#define __XMLIO_CField__
-
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+#ifndef __XIOS_CField__
+#define __XIOS_CField__
+
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "group_factory.hpp"
 #include "functor.hpp"
@@ -230,3 +230,3 @@
 
 
-#endif // __XMLIO_CField__
+#endif // __XIOS_CField__
Index: /XIOS/trunk/src/node/field_impl.hpp
===================================================================
--- /XIOS/trunk/src/node/field_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/node/field_impl.hpp	(revision 591)
@@ -3,5 +3,5 @@
 #define __FIELD_IMPL_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "field.hpp"
 #include "context.hpp"
Index: /XIOS/trunk/src/node/file.cpp
===================================================================
--- /XIOS/trunk/src/node/file.cpp	(revision 590)
+++ /XIOS/trunk/src/node/file.cpp	(revision 591)
@@ -13,5 +13,5 @@
 #include "message.hpp"
 #include "type.hpp"
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "context_client.hpp"
 #include "mpi.hpp"
Index: /XIOS/trunk/src/node/file.hpp
===================================================================
--- /XIOS/trunk/src/node/file.hpp	(revision 590)
+++ /XIOS/trunk/src/node/file.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CFile__
-#define __XMLIO_CFile__
+#ifndef __XIOS_CFile__
+#define __XIOS_CFile__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "field.hpp"
 #include "data_output.hpp"
@@ -177,3 +177,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CFile__
+#endif // __XIOS_CFile__
Index: /XIOS/trunk/src/node/grid.cpp
===================================================================
--- /XIOS/trunk/src/node/grid.cpp	(revision 590)
+++ /XIOS/trunk/src/node/grid.cpp	(revision 591)
@@ -7,5 +7,5 @@
 #include "message.hpp"
 #include <iostream>
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "type.hpp"
 #include "context.hpp"
Index: /XIOS/trunk/src/node/grid.hpp
===================================================================
--- /XIOS/trunk/src/node/grid.hpp	(revision 590)
+++ /XIOS/trunk/src/node/grid.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CGrid__
-#define __XMLIO_CGrid__
-
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+#ifndef __XIOS_CGrid__
+#define __XIOS_CGrid__
+
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "group_factory.hpp"
 
@@ -342,3 +342,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CGrid__
+#endif // __XIOS_CGrid__
Index: /XIOS/trunk/src/node/method.hpp
===================================================================
--- /XIOS/trunk/src/node/method.hpp	(revision 590)
+++ /XIOS/trunk/src/node/method.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_CMethod__
-#define __XMLIO_CMethod__
+#ifndef __XIOS_CMethod__
+#define __XIOS_CMethod__
 
 namespace xios
@@ -97,3 +97,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CMethod__
+#endif // __XIOS_CMethod__
Index: /XIOS/trunk/src/node/node_enum.hpp
===================================================================
--- /XIOS/trunk/src/node/node_enum.hpp	(revision 590)
+++ /XIOS/trunk/src/node/node_enum.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_NODE_ENUM__
-#define __XMLIO_NODE_ENUM__
+#ifndef __XIOS_NODE_ENUM__
+#define __XIOS_NODE_ENUM__
 
 //#define DECLARE_NODE(Name_, name_)     ,e##Name_, g##Name_
@@ -26,3 +26,3 @@
 } // namespace xios
 
-#endif // __XMLIO_NODE_ENUM__
+#endif // __XIOS_NODE_ENUM__
Index: /XIOS/trunk/src/node/node_type.hpp
===================================================================
--- /XIOS/trunk/src/node/node_type.hpp	(revision 590)
+++ /XIOS/trunk/src/node/node_type.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_NODE_TYPE__
-#define __XMLIO_NODE_TYPE__
+#ifndef __XIOS_NODE_TYPE__
+#define __XIOS_NODE_TYPE__
 
 #include "axis.hpp"
@@ -10,3 +10,3 @@
 #include "context.hpp"
 
-#endif // __XMLIO_NODE_TYPE__
+#endif // __XIOS_NODE_TYPE__
Index: /XIOS/trunk/src/node/var.hpp
===================================================================
--- /XIOS/trunk/src/node/var.hpp	(revision 590)
+++ /XIOS/trunk/src/node/var.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_CVar__
-#define __XMLIO_CVar__
+#ifndef __XIOS_CVar__
+#define __XIOS_CVar__
 
 namespace xios
@@ -97,3 +97,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CVar__
+#endif // __XIOS_CVar__
Index: /XIOS/trunk/src/node/variable.cpp
===================================================================
--- /XIOS/trunk/src/node/variable.cpp	(revision 590)
+++ /XIOS/trunk/src/node/variable.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include "group_template.hpp"
 #include "object_factory.hpp"
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "type.hpp"
 #include "context.hpp"
Index: /XIOS/trunk/src/node/variable.hpp
===================================================================
--- /XIOS/trunk/src/node/variable.hpp	(revision 590)
+++ /XIOS/trunk/src/node/variable.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CVariable__
-#define __XMLIO_CVariable__
+#ifndef __XIOS_CVariable__
+#define __XIOS_CVariable__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "declare_group.hpp"
 #include "group_template.hpp"
@@ -141,3 +141,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CVariable__
+#endif // __XIOS_CVariable__
Index: /XIOS/trunk/src/object.hpp
===================================================================
--- /XIOS/trunk/src/object.hpp	(revision 590)
+++ /XIOS/trunk/src/object.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CObject__
-#define __XMLIO_CObject__
+#ifndef __XIOS_CObject__
+#define __XIOS_CObject__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 
 namespace xios
@@ -57,4 +57,4 @@
 } // namespace xios
 
-#endif // __XMLIO_CObject__
+#endif // __XIOS_CObject__
 
Index: /XIOS/trunk/src/object_factory.hpp
===================================================================
--- /XIOS/trunk/src/object_factory.hpp	(revision 590)
+++ /XIOS/trunk/src/object_factory.hpp	(revision 591)
@@ -1,10 +1,10 @@
-#ifndef __XMLIO_CObjectFactory__
-#define __XMLIO_CObjectFactory__
+#ifndef __XIOS_CObjectFactory__
+#define __XIOS_CObjectFactory__
 
 /// boost headers ///
 #include <boost/shared_ptr.hpp>
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "object_template.hpp"
@@ -64,3 +64,3 @@
 //#include "object_factory_impl.hpp"
 
-#endif // __XMLIO_CObjectFactory__
+#endif // __XIOS_CObjectFactory__
Index: /XIOS/trunk/src/object_factory_impl.hpp
===================================================================
--- /XIOS/trunk/src/object_factory_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/object_factory_impl.hpp	(revision 591)
@@ -1,4 +1,4 @@
-#ifndef __XMLIO_CObjectFactory_impl__
-#define __XMLIO_CObjectFactory_impl__
+#ifndef __XIOS_CObjectFactory_impl__
+#define __XIOS_CObjectFactory_impl__
 
 #include "object_factory.hpp"
@@ -152,3 +152,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CObjectFactory_impl__
+#endif // __XIOS_CObjectFactory_impl__
Index: /XIOS/trunk/src/object_template.hpp
===================================================================
--- /XIOS/trunk/src/object_template.hpp	(revision 590)
+++ /XIOS/trunk/src/object_template.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CObjectTemplate__
-#define __XMLIO_CObjectTemplate__
+#ifndef __XIOS_CObjectTemplate__
+#define __XIOS_CObjectTemplate__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "attribute_map.hpp"
 #include "node_enum.hpp"
@@ -109,3 +109,3 @@
 //#include "object_template_impl.hpp"
 
-#endif // __XMLIO_CObjectTemplate__
+#endif // __XIOS_CObjectTemplate__
Index: /XIOS/trunk/src/object_template_decl.cpp
===================================================================
--- /XIOS/trunk/src/object_template_decl.cpp	(revision 590)
+++ /XIOS/trunk/src/object_template_decl.cpp	(revision 591)
@@ -1,4 +1,4 @@
 #include "object_template_impl.hpp"
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "field.hpp"
 #include "context.hpp"
Index: /XIOS/trunk/src/object_template_impl.hpp
===================================================================
--- /XIOS/trunk/src/object_template_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/object_template_impl.hpp	(revision 591)
@@ -1,6 +1,6 @@
-#ifndef __XMLIO_CObjectTemplate_impl__
-#define __XMLIO_CObjectTemplate_impl__
-
-#include "xmlioserver_spl.hpp"
+#ifndef __XIOS_CObjectTemplate_impl__
+#define __XIOS_CObjectTemplate_impl__
+
+#include "xios_spl.hpp"
 #include "context_client.hpp"
 #include "object_factory.hpp"
@@ -330,5 +330,5 @@
      oss << "#include <boost/multi_array.hpp>" << iendl;
      oss << "#include <boost/shared_ptr.hpp>" << iendl;
-     oss << "#include \"xmlioserver.hpp\"" << iendl;
+     oss << "#include \"xios.hpp\"" << iendl;
      oss << "#include \"attribute_template.hpp\"" << iendl;
      oss << "#include \"object_template.hpp\"" << iendl;
@@ -417,3 +417,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CObjectTemplate_impl__
+#endif // __XIOS_CObjectTemplate_impl__
Index: /XIOS/trunk/src/output/nc4_data_output.hpp
===================================================================
--- /XIOS/trunk/src/output/nc4_data_output.hpp	(revision 590)
+++ /XIOS/trunk/src/output/nc4_data_output.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_NC4_DATA_OUTPUT__
-#define __XMLIO_NC4_DATA_OUTPUT__
+#ifndef __XIOS_NC4_DATA_OUTPUT__
+#define __XIOS_NC4_DATA_OUTPUT__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "onetcdf4.hpp"
 #include "data_output.hpp"
@@ -100,3 +100,3 @@
 } // namespace xios
 
-#endif //__XMLIO_NC4_DATA_OUTPUT__
+#endif //__XIOS_NC4_DATA_OUTPUT__
Index: /XIOS/trunk/src/output/netCdfInterface.hpp
===================================================================
--- /XIOS/trunk/src/output/netCdfInterface.hpp	(revision 590)
+++ /XIOS/trunk/src/output/netCdfInterface.hpp	(revision 591)
@@ -10,5 +10,5 @@
 #define __NETCDF_INTERFACE_HPP_
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 
 #if !defined(USING_NETCDF_PAR)
Index: /XIOS/trunk/src/output/onetcdf4.hpp
===================================================================
--- /XIOS/trunk/src/output/onetcdf4.hpp	(revision 590)
+++ /XIOS/trunk/src/output/onetcdf4.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_INETCDF4__
-#define __XMLIO_INETCDF4__
+#ifndef __XIOS_INETCDF4__
+#define __XIOS_INETCDF4__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "data_output.hpp"
@@ -130,3 +130,3 @@
 } // namespace xios
 
-#endif //__XMLIO_INETCDF4__
+#endif //__XIOS_INETCDF4__
Index: OS/trunk/src/parameters.cpp
===================================================================
--- /XIOS/trunk/src/parameters.cpp	(revision 590)
+++ 	(revision )
@@ -1,6 +1,0 @@
-namespace xmlioserver
-{
-  
-  
-  
-}
Index: /XIOS/trunk/src/server.cpp
===================================================================
--- /XIOS/trunk/src/server.cpp	(revision 590)
+++ /XIOS/trunk/src/server.cpp	(revision 591)
@@ -1,4 +1,4 @@
 #include "globalScopeData.hpp"
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "cxios.hpp"
 #include "server.hpp"
Index: /XIOS/trunk/src/server.hpp
===================================================================
--- /XIOS/trunk/src/server.hpp	(revision 590)
+++ /XIOS/trunk/src/server.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __SERVER_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "context.hpp"
 #include "mpi.hpp"
Index: /XIOS/trunk/src/server_distribution_description.hpp
===================================================================
--- /XIOS/trunk/src/server_distribution_description.hpp	(revision 590)
+++ /XIOS/trunk/src/server_distribution_description.hpp	(revision 591)
@@ -11,5 +11,5 @@
 #define __XIOS_SERVER_DISTRIBUTION_DESCRIPTION_HPP
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "array_new.hpp"
 #include <boost/unordered_map.hpp>
Index: /XIOS/trunk/src/test/test_xios.cpp
===================================================================
--- /XIOS/trunk/src/test/test_xios.cpp	(revision 590)
+++ /XIOS/trunk/src/test/test_xios.cpp	(revision 591)
@@ -1,3 +1,3 @@
-#include "xmlioserver.hpp"
+#include "xios.hpp"
 #include "attribute_template.hpp"
 #include "buffer_out.hpp"
Index: /XIOS/trunk/src/type/base_type.hpp
===================================================================
--- /XIOS/trunk/src/type/base_type.hpp	(revision 590)
+++ /XIOS/trunk/src/type/base_type.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __BASE_TYPE_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "buffer_in.hpp"
 #include "buffer_out.hpp"
Index: /XIOS/trunk/src/type/enum.hpp
===================================================================
--- /XIOS/trunk/src/type/enum.hpp	(revision 590)
+++ /XIOS/trunk/src/type/enum.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __XIOS_ENUM__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "buffer_in.hpp"
Index: /XIOS/trunk/src/type/enum_impl.hpp
===================================================================
--- /XIOS/trunk/src/type/enum_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/type/enum_impl.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __XIOS_ENUM_IMPL__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "buffer_in.hpp"
Index: /XIOS/trunk/src/type/enum_ref_impl.hpp
===================================================================
--- /XIOS/trunk/src/type/enum_ref_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/type/enum_ref_impl.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __XIOS_ENUM_REF_IMPL__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "buffer_in.hpp"
Index: /XIOS/trunk/src/type/message.cpp
===================================================================
--- /XIOS/trunk/src/type/message.cpp	(revision 590)
+++ /XIOS/trunk/src/type/message.cpp	(revision 591)
@@ -1,3 +1,3 @@
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "message.hpp"
 #include "base_type.hpp"
Index: /XIOS/trunk/src/type/message.hpp
===================================================================
--- /XIOS/trunk/src/type/message.hpp	(revision 590)
+++ /XIOS/trunk/src/type/message.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __MESSAGE_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "base_type.hpp"
Index: /XIOS/trunk/src/type/type.hpp
===================================================================
--- /XIOS/trunk/src/type/type.hpp	(revision 590)
+++ /XIOS/trunk/src/type/type.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __XIOS_TYPE__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "buffer_in.hpp"
Index: /XIOS/trunk/src/type/type_decl.cpp
===================================================================
--- /XIOS/trunk/src/type/type_decl.cpp	(revision 590)
+++ /XIOS/trunk/src/type/type_decl.cpp	(revision 591)
@@ -5,5 +5,5 @@
 #include <string> ;
 #include "date.hpp"
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 
 namespace xios
Index: /XIOS/trunk/src/type/type_impl.hpp
===================================================================
--- /XIOS/trunk/src/type/type_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/type/type_impl.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __XIOS_TYPE_IMPL__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "buffer_in.hpp"
Index: /XIOS/trunk/src/type/type_ref_impl.hpp
===================================================================
--- /XIOS/trunk/src/type/type_ref_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/type/type_ref_impl.hpp	(revision 591)
@@ -3,5 +3,5 @@
 #define __XIOS_TYPE_REF_IMPL__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "buffer_in.hpp"
Index: /XIOS/trunk/src/type/type_specialisation.hpp
===================================================================
--- /XIOS/trunk/src/type/type_specialisation.hpp	(revision 590)
+++ /XIOS/trunk/src/type/type_specialisation.hpp	(revision 591)
@@ -2,5 +2,5 @@
 #define __XIOS_TYPE_SPECIALISATION_HPP__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "buffer_in.hpp"
Index: /XIOS/trunk/src/xios.hpp
===================================================================
--- /XIOS/trunk/src/xios.hpp	(revision 591)
+++ /XIOS/trunk/src/xios.hpp	(revision 591)
@@ -0,0 +1,14 @@
+#ifndef __XIOS__
+#define __XIOS__
+
+#include "xios_spl.hpp"
+
+/// XIOS headers ///
+#include "nc4_data_output.hpp"
+
+
+using namespace xios;
+using namespace xios::xml;
+using namespace xios::func;
+
+#endif //__XIOS__
Index: /XIOS/trunk/src/xios_spl.hpp
===================================================================
--- /XIOS/trunk/src/xios_spl.hpp	(revision 591)
+++ /XIOS/trunk/src/xios_spl.hpp	(revision 591)
@@ -0,0 +1,61 @@
+#ifndef __XIOS_SPL__
+#define __XIOS_SPL__
+
+/// standard C++ headers ///
+#include <utility>
+#include <string>
+#include <algorithm>
+
+// standard C
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
+#include <ctime>
+
+// Conteneurs.
+#include <vector>
+#include <set>
+#include <stack>
+#include <list>
+#include <map>
+#include <deque>
+#include <queue>
+#include <valarray>
+// Flux.
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+/// boost headers ///
+//#include <boost/unordered_map.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/cast.hpp>
+/// Map ///
+#define xios_map std::map
+
+/// Macro ///
+#define UNUSED(parameter)
+
+/// DÃ©finition de types (issus de la bibliothÃšque standard)///
+typedef std::ostringstream StdOStringStream;
+typedef std::istringstream StdIStringStream;
+typedef std::stringstream  StdStringStream;
+typedef std::ofstream      StdOFStream;
+typedef std::ifstream      StdIFStream;
+typedef std::ostream       StdOStream;
+typedef std::istream       StdIStream;
+typedef std::string        StdString;
+typedef std::size_t        StdSize;
+
+typedef  unsigned short int   ushort;
+typedef  unsigned int         uint;
+typedef  unsigned long int    ulong;
+
+/// XIOS headers ///
+#include "configure.hpp"
+#include "log.hpp"
+using namespace std;
+using namespace boost ;
+
+
+#endif //__XIOS_SPL__
Index: /XIOS/trunk/src/xml_node.cpp
===================================================================
--- /XIOS/trunk/src/xml_node.cpp	(revision 590)
+++ /XIOS/trunk/src/xml_node.cpp	(revision 591)
@@ -99,3 +99,3 @@
 
    }// namespace xml
-} // namespace xmlioserve
+} // namespace xios
Index: /XIOS/trunk/src/xml_node.hpp
===================================================================
--- /XIOS/trunk/src/xml_node.hpp	(revision 590)
+++ /XIOS/trunk/src/xml_node.hpp	(revision 591)
@@ -1,10 +1,10 @@
-#ifndef __XMLIO_CXMLNode__
-#define __XMLIO_CXMLNode__
+#ifndef __XIOS_CXMLNode__
+#define __XIOS_CXMLNode__
 
 /// rapidXML headers ///
 #include <rapidxml.hpp>
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 
 namespace xios
@@ -55,3 +55,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CXMLNode__
+#endif // __XIOS_CXMLNode__
Index: /XIOS/trunk/src/xml_parser.hpp
===================================================================
--- /XIOS/trunk/src/xml_parser.hpp	(revision 590)
+++ /XIOS/trunk/src/xml_parser.hpp	(revision 591)
@@ -1,7 +1,7 @@
-#ifndef __XMLIO_CXMLParser__
-#define __XMLIO_CXMLParser__
+#ifndef __XIOS_CXMLParser__
+#define __XIOS_CXMLParser__
 
-/// xios headers ///
-#include "xmlioserver_spl.hpp"
+/// XIOS headers ///
+#include "xios_spl.hpp"
 #include "exception.hpp"
 #include "xml_node.hpp"
@@ -49,3 +49,3 @@
 } // namespace xios
 
-#endif // __XMLIO_CXMLParser__
+#endif // __XIOS_CXMLParser__
Index: /XIOS/trunk/src/xml_parser_impl.hpp
===================================================================
--- /XIOS/trunk/src/xml_parser_impl.hpp	(revision 590)
+++ /XIOS/trunk/src/xml_parser_impl.hpp	(revision 591)
@@ -1,6 +1,6 @@
-#ifndef __XMLIO_CXML_PARSER_IMPL__
-#define __XMLIO_CXML_PARSER_IMPL__
+#ifndef __XIOS_CXML_PARSER_IMPL__
+#define __XIOS_CXML_PARSER_IMPL__
 
-/// xios headers ///
+/// XIOS headers ///
 #include "xml_parser.hpp"
 
@@ -47,4 +47,4 @@
 } // namespace xios
 
-#endif // __XMLIO_CXML_PARSER_IMPL__
+#endif // __XIOS_CXML_PARSER_IMPL__
 
Index: OS/trunk/src/xmlioserver.hpp
===================================================================
--- /XIOS/trunk/src/xmlioserver.hpp	(revision 590)
+++ 	(revision )
@@ -1,14 +1,0 @@
-#ifndef __XMLIO__
-#define __XMLIO__
-
-#include "xmlioserver_spl.hpp"
-
-/// xios headers ///
-#include "nc4_data_output.hpp"
-
-
-using namespace xios;
-using namespace xios::xml;
-using namespace xios::func;
-
-#endif //__XMLIO__
Index: OS/trunk/src/xmlioserver_spl.hpp
===================================================================
--- /XIOS/trunk/src/xmlioserver_spl.hpp	(revision 590)
+++ 	(revision )
@@ -1,61 +1,0 @@
-#ifndef __XMLIO_SPL__
-#define __XMLIO_SPL__
-
-/// standard C++ headers ///
-#include <utility>
-#include <string>
-#include <algorithm>
-
-// standard C
-#include <cstring>
-#include <cstdlib>
-#include <cmath>
-#include <ctime>
-
-// Conteneurs.
-#include <vector>
-#include <set>
-#include <stack>
-#include <list>
-#include <map>
-#include <deque>
-#include <queue>
-#include <valarray>
-// Flux.
-#include <iostream>
-#include <fstream>
-#include <sstream>
-
-/// boost headers ///
-//#include <boost/unordered_map.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/cast.hpp>
-/// Map ///
-#define xios_map std::map
-
-/// Macro ///
-#define UNUSED(parameter)
-
-/// DÃ©finition de types (issus de la bibliothÃšque standard)///
-typedef std::ostringstream StdOStringStream;
-typedef std::istringstream StdIStringStream;
-typedef std::stringstream  StdStringStream;
-typedef std::ofstream      StdOFStream;
-typedef std::ifstream      StdIFStream;
-typedef std::ostream       StdOStream;
-typedef std::istream       StdIStream;
-typedef std::string        StdString;
-typedef std::size_t        StdSize;
-
-typedef  unsigned short int   ushort;
-typedef  unsigned int         uint;
-typedef  unsigned long int    ulong;
-
-/// xios headers ///
-#include "configure.hpp"
-#include "log.hpp"
-using namespace std;
-using namespace boost ;
-
-
-#endif //__XMLIO_SPL__
