diff --git a/Core/Code/IO/mitkItkLoggingAdapter.cpp b/Core/Code/IO/mitkItkLoggingAdapter.cpp
new file mode 100644
index 0000000000..eb6cd29237
--- /dev/null
+++ b/Core/Code/IO/mitkItkLoggingAdapter.cpp
@@ -0,0 +1,37 @@
+/*===================================================================
+
+The Medical Imaging Interaction Toolkit (MITK)
+
+Copyright (c) German Cancer Research Center, 
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without 
+even the implied warranty of MERCHANTABILITY or FITNESS FOR 
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "mitkItkLoggingAdapter.h"
+#include "mitkLogMacros.h"
+
+void mitk::ItkLoggingAdapter::Initialize()
+{
+   itk::OutputWindow::SetInstance(mitk::ItkLoggingAdapter::New());
+}
+
+void mitk::ItkLoggingAdapter::DisplayText(const char* s)
+{
+   MITK_INFO("ItkLogging") << s;
+}
+
+mitk::ItkLoggingAdapter::ItkLoggingAdapter()
+{
+}
+
+mitk::ItkLoggingAdapter::~ItkLoggingAdapter()
+{
+}
+
diff --git a/Core/Code/IO/mitkItkLoggingAdapter.h b/Core/Code/IO/mitkItkLoggingAdapter.h
new file mode 100644
index 0000000000..3e45955653
--- /dev/null
+++ b/Core/Code/IO/mitkItkLoggingAdapter.h
@@ -0,0 +1,63 @@
+/*===================================================================
+
+The Medical Imaging Interaction Toolkit (MITK)
+
+Copyright (c) German Cancer Research Center, 
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without 
+even the implied warranty of MERCHANTABILITY or FITNESS FOR 
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+
+#ifndef ItkLoggingAdapter_H_HEADER_INCLUDED
+#define ItkLoggingAdapter_H_HEADER_INCLUDED
+
+#include <MitkExports.h>
+#include <itkOutputWindow.h>
+#include <itkObjectFactory.h>
+
+namespace mitk {
+//##Documentation
+//## @brief Adapter that overwrites the standard itk logging output window and sends the logging messages to the MITK logging instead.
+//## @ingroup IO
+
+// this class is used to send output to stdout and not the itk window
+class MITK_CORE_EXPORT ItkLoggingAdapter : public itk::OutputWindow
+{
+public:
+  typedef ItkLoggingAdapter                Self;
+  typedef itk::SmartPointer<Self>                Pointer;
+  typedef itk::SmartPointer<const Self>          ConstPointer;
+
+  /** Run-time type information (and related methods).   */
+  itkTypeMacro( ItkLoggingAdapter, itk::OutputWindow );
+
+  /** New macro for creation of through a Smart Pointer   */
+  itkNewMacro(ItkLoggingAdapter);
+
+  /** @brief Initializes the logging adapter. Itk logging 
+    *        messages are redirected to MITK logging afterwards. 
+    */
+  static void Initialize();
+  
+  virtual void DisplayText(const char* s);
+
+protected:
+  ItkLoggingAdapter();
+  virtual ~ItkLoggingAdapter();
+
+private:
+  ItkLoggingAdapter(const Self&); //purposely not implemented
+  void operator=(const Self&); //purposely not implemented
+};
+
+
+}
+
+#endif /* mitkItkLoggingAdapter_H_HEADER_INCLUDED */
diff --git a/Core/Code/IO/mitkVtkLoggingAdapter.h b/Core/Code/IO/mitkVtkLoggingAdapter.h
index 918c11238e..ba0b9a8613 100644
--- a/Core/Code/IO/mitkVtkLoggingAdapter.h
+++ b/Core/Code/IO/mitkVtkLoggingAdapter.h
@@ -1,54 +1,57 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center, 
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without 
 even the implied warranty of MERCHANTABILITY or FITNESS FOR 
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef VtkLoggingAdapter_H_HEADER_INCLUDED
 #define VtkLoggingAdapter_H_HEADER_INCLUDED
 
 #include <MitkExports.h>
 #include <vtkOutputWindow.h>
 #include <vtkSmartPointer.h>
 
 namespace mitk {
 //##Documentation
 //## @brief Adapter that overwrites the standard vtk logging output window and sends the logging messages to the MITK logging instead.
 //## @ingroup IO
 class MITK_CORE_EXPORT VtkLoggingAdapter : public vtkOutputWindow
 {
 public:
   
   static VtkLoggingAdapter* New();
 
+  /** @brief Initializes the logging adapter. Vtk logging 
+    *        messages are redirected to MITK logging afterwards. 
+    */
   static void Initialize();
   
   virtual void DisplayText(const char* t);
   
   virtual void DisplayErrorText(const char *t);
   
   virtual void DisplayWarningText(const char *t);
   
   virtual void DisplayGenericWarningText(const char *t);
   
   virtual void DisplayDebugText(const char *t);
   
   
 protected:
 
 };
 
 } // namespace mitk
 
 #endif /* VtkLoggingAdapter_H_HEADER_INCLUDED */
diff --git a/Core/Code/Testing/files.cmake b/Core/Code/Testing/files.cmake
index e2fe4485e8..5adde09786 100644
--- a/Core/Code/Testing/files.cmake
+++ b/Core/Code/Testing/files.cmake
@@ -1,118 +1,118 @@
 
 # tests with no extra command line parameter
 set(MODULE_TESTS
   mitkAccessByItkTest.cpp
   mitkCoreObjectFactoryTest.cpp
   mitkMaterialTest.cpp
   mitkActionTest.cpp
   mitkEnumerationPropertyTest.cpp
   mitkEventTest.cpp
   mitkFocusManagerTest.cpp
   mitkGenericPropertyTest.cpp
   mitkGeometry3DTest.cpp
   mitkGeometryDataToSurfaceFilterTest.cpp
   mitkGlobalInteractionTest.cpp
   mitkImageDataItemTest.cpp
   #mitkImageMapper2DTest.cpp
   mitkImageGeneratorTest.cpp
   mitkBaseDataTest.cpp
   #mitkImageToItkTest.cpp
   mitkInstantiateAccessFunctionTest.cpp
   mitkInteractorTest.cpp
   mitkITKThreadingTest.cpp
   # mitkLevelWindowManagerTest.cpp
   mitkLevelWindowTest.cpp
   mitkMessageTest.cpp
   #mitkPipelineSmartPointerCorrectnessTest.cpp
   mitkPixelTypeTest.cpp
   mitkPlaneGeometryTest.cpp
   mitkPointSetFileIOTest.cpp
   mitkPointSetTest.cpp
   mitkPointSetWriterTest.cpp
   mitkPointSetReaderTest.cpp
   mitkPointSetInteractorTest.cpp
   mitkPropertyTest.cpp
   mitkPropertyListTest.cpp
   #mitkRegistrationBaseTest.cpp
   #mitkSegmentationInterpolationTest.cpp
   mitkSlicedGeometry3DTest.cpp
   mitkSliceNavigationControllerTest.cpp
   mitkStateMachineTest.cpp
   mitkStateTest.cpp
   mitkSurfaceTest.cpp
   mitkSurfaceToSurfaceFilterTest.cpp
   mitkTimeSlicedGeometryTest.cpp
   mitkTransitionTest.cpp
   mitkUndoControllerTest.cpp
   mitkVtkWidgetRenderingTest.cpp
   mitkVerboseLimitedLinearUndoTest.cpp
   mitkWeakPointerTest.cpp
   mitkTransferFunctionTest.cpp
   #mitkAbstractTransformGeometryTest.cpp
   mitkStepperTest.cpp
   itkTotalVariationDenoisingImageFilterTest.cpp
   mitkRenderingManagerTest.cpp
   vtkMitkThickSlicesFilterTest.cpp
   mitkNodePredicateSourceTest.cpp
   mitkVectorTest.cpp
   mitkClippedSurfaceBoundsCalculatorTest.cpp
   #QmitkRenderingTestHelper.cpp
   mitkExceptionTest.cpp
   mitkExtractSliceFilterTest.cpp
   mitkLogTest.cpp
   mitkImageDimensionConverterTest.cpp
-  mitkVtkLoggingAdapterTest.cpp
+  mitkLoggingAdapterTest.cpp
 )
 
 # test with image filename as an extra command line parameter
 set(MODULE_IMAGE_TESTS
   mitkPlanePositionManagerTest.cpp
   mitkSurfaceVtkWriterTest.cpp
   #mitkImageSliceSelectorTest.cpp
   mitkImageTimeSelectorTest.cpp
   # mitkVtkPropRendererTest.cpp
   mitkDataNodeFactoryTest.cpp
   #mitkSTLFileReaderTest.cpp
 )
 
 # list of images for which the tests are run
 set(MODULE_TESTIMAGES
  # Pic-Factory no more available in Core, test images now in .nrrd format
   US4DCyl.nrrd
   Pic3D.nrrd
   Pic2DplusT.nrrd
   BallBinary30x30x30.nrrd
   binary.stl
   ball.stl
 )
 
 set(MODULE_CUSTOM_TESTS
     #mitkLabeledImageToSurfaceFilterTest.cpp
     #mitkExternalToolsTest.cpp
     mitkDataStorageTest.cpp
     mitkDataNodeTest.cpp
     mitkDicomSeriesReaderTest.cpp
     mitkDICOMLocaleTest.cpp
     mitkEventMapperTest.cpp
     mitkNodeDependentPointSetInteractorTest.cpp
     mitkStateMachineFactoryTest.cpp
     mitkPointSetLocaleTest.cpp
     mitkImageTest.cpp
     mitkImageWriterTest.cpp
     mitkImageVtkMapper2DTest.cpp
     mitkImageVtkMapper2DLevelWindowTest.cpp
     mitkImageVtkMapper2DOpacityTest.cpp
     mitkImageVtkMapper2DColorTest.cpp
     mitkImageVtkMapper2DSwivelTest.cpp
 )
 
 # Create an artificial module initializing class for
 # the usServiceListenerTest.cpp
 usFunctionGenerateModuleInit(testdriver_init_file
                              NAME ${MODULE_NAME}TestDriver
                              DEPENDS "Mitk"
                              VERSION "0.1.0"
                              EXECUTABLE
                             )
 
 set(TEST_CPP_FILES ${testdriver_init_file} mitkRenderingTestHelper.cpp)
diff --git a/Core/Code/Testing/mitkVtkLoggingAdapterTest.cpp b/Core/Code/Testing/mitkLoggingAdapterTest.cpp
similarity index 64%
rename from Core/Code/Testing/mitkVtkLoggingAdapterTest.cpp
rename to Core/Code/Testing/mitkLoggingAdapterTest.cpp
index c731177f25..7b83cb6da1 100644
--- a/Core/Code/Testing/mitkVtkLoggingAdapterTest.cpp
+++ b/Core/Code/Testing/mitkLoggingAdapterTest.cpp
@@ -1,56 +1,86 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center, 
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without 
 even the implied warranty of MERCHANTABILITY or FITNESS FOR 
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "mitkTestingMacros.h"
 #include <mitkVtkLoggingAdapter.h>
+#include <mitkItkLoggingAdapter.h>
+#include <mitkCommon.h>
 
+class ItkLoggingTestClass : public itk::Object
+  {
+  public: 
 
+    mitkClassMacro( ItkLoggingTestClass , itk::Object );
+    itkNewMacro( ItkLoggingTestClass );
 
-class VtkLoggingAdapterTestClass
+    void TestItkWarningMessage()
+      {
+      itkWarningMacro("Test ITK Warning message");
+      }
+   
+  };
+
+/** @brief This test tests all logging adapters of MITK. */
+class LoggingAdapterTestClass
 {
 public: 
   
   static void TestVtkLoggingWithoutAdapter()
     {
     MITK_TEST_OUTPUT(<<"Testing vtk logging without adapter class: a separate window should open and display the logging messages.")
     vtkOutputWindow::GetInstance()->DisplayText("Test VTK InfoMessage");
     vtkOutputWindow::GetInstance()->DisplayDebugText("Test Vtk Debug Message");
     vtkOutputWindow::GetInstance()->DisplayGenericWarningText("Test Vtk Generic Warning Message");
     vtkOutputWindow::GetInstance()->DisplayWarningText("Test Vtk Warning Message");
     vtkOutputWindow::GetInstance()->DisplayErrorText("Test Vtk Error Message");
     MITK_TEST_CONDITION_REQUIRED(true,"Testing if Vtk logging without adapter runs without errors.");
     }
   static void TestVtkLoggingWithAdapter()
     {
     MITK_TEST_OUTPUT(<<"Testing vtk logging with adapter class: Vtk logging messages should be logged as MITK logging messages.")
     mitk::VtkLoggingAdapter::Initialize();
     vtkOutputWindow::GetInstance()->DisplayText("Test Vtk Info Message");
     vtkOutputWindow::GetInstance()->DisplayDebugText("Test Vtk Debug Message");
     vtkOutputWindow::GetInstance()->DisplayGenericWarningText("Test Vtk Generic Warning Message");
     vtkOutputWindow::GetInstance()->DisplayWarningText("Test Vtk Warning Message");
     vtkOutputWindow::GetInstance()->DisplayErrorText("Test Vtk Error Message");
     MITK_TEST_CONDITION_REQUIRED(true,"Testing if Vtk logging with MITK logging adapter runs without errors.");
     }
+
+  static void TestItkLoggingWithoutAdapter()
+    {
+    ItkLoggingTestClass::Pointer myItkLogger = ItkLoggingTestClass::New();
+    myItkLogger->TestItkWarningMessage();
+    }
+
+  static void TestItkLoggingWithAdapter()
+    {
+    mitk::ItkLoggingAdapter::Initialize();
+    ItkLoggingTestClass::Pointer myItkLogger = ItkLoggingTestClass::New();
+    myItkLogger->TestItkWarningMessage();
+    }
 };
 
-int mitkVtkLoggingAdapterTest(int /*argc*/, char* /*argv*/[])
+int mitkLoggingAdapterTest(int /*argc*/, char* /*argv*/[])
 {
-  MITK_TEST_BEGIN("VtkLoggingAdapter");
-  VtkLoggingAdapterTestClass::TestVtkLoggingWithoutAdapter();
-  VtkLoggingAdapterTestClass::TestVtkLoggingWithAdapter();
+  MITK_TEST_BEGIN("LoggingAdapters: VTK, ITK");
+  LoggingAdapterTestClass::TestVtkLoggingWithoutAdapter();
+  LoggingAdapterTestClass::TestVtkLoggingWithAdapter();
+  LoggingAdapterTestClass::TestItkLoggingWithoutAdapter();
+  LoggingAdapterTestClass::TestItkLoggingWithAdapter();
   MITK_TEST_END();
 }
diff --git a/Core/Code/files.cmake b/Core/Code/files.cmake
index 10bbd3b47d..f3ee81de50 100644
--- a/Core/Code/files.cmake
+++ b/Core/Code/files.cmake
@@ -1,305 +1,306 @@
 set(H_FILES
   Algorithms/itkImportMitkImageContainer.h
   Algorithms/itkImportMitkImageContainer.txx
   Algorithms/itkLocalVariationImageFilter.h
   Algorithms/itkLocalVariationImageFilter.txx
   Algorithms/itkMITKScalarImageToHistogramGenerator.h
   Algorithms/itkMITKScalarImageToHistogramGenerator.txx
   Algorithms/itkTotalVariationDenoisingImageFilter.h
   Algorithms/itkTotalVariationDenoisingImageFilter.txx
   Algorithms/itkTotalVariationSingleIterationImageFilter.h
   Algorithms/itkTotalVariationSingleIterationImageFilter.txx
   Algorithms/mitkBilateralFilter.h
   Algorithms/mitkBilateralFilter.cpp
   Algorithms/mitkInstantiateAccessFunctions.h
   Algorithms/mitkPixelTypeList.h
   # Preprocessor macros taken from Boost
   Algorithms/mitkPPArithmeticDec.h
   Algorithms/mitkPPArgCount.h
   Algorithms/mitkPPCat.h
   Algorithms/mitkPPConfig.h
   Algorithms/mitkPPControlExprIIf.h
   Algorithms/mitkPPControlIf.h
   Algorithms/mitkPPControlIIf.h
   Algorithms/mitkPPDebugError.h
   Algorithms/mitkPPDetailAutoRec.h
   Algorithms/mitkPPDetailDMCAutoRec.h
   Algorithms/mitkPPExpand.h
   Algorithms/mitkPPFacilitiesEmpty.h
   Algorithms/mitkPPFacilitiesExpand.h
   Algorithms/mitkPPLogicalBool.h
   Algorithms/mitkPPRepetitionDetailDMCFor.h
   Algorithms/mitkPPRepetitionDetailEDGFor.h
   Algorithms/mitkPPRepetitionDetailFor.h
   Algorithms/mitkPPRepetitionDetailMSVCFor.h
   Algorithms/mitkPPRepetitionFor.h
   Algorithms/mitkPPSeqElem.h
   Algorithms/mitkPPSeqForEach.h
   Algorithms/mitkPPSeqForEachProduct.h
   Algorithms/mitkPPSeq.h
   Algorithms/mitkPPSeqEnum.h
   Algorithms/mitkPPSeqSize.h
   Algorithms/mitkPPSeqToTuple.h
   Algorithms/mitkPPStringize.h
   Algorithms/mitkPPTupleEat.h
   Algorithms/mitkPPTupleElem.h
   Algorithms/mitkPPTupleRem.h
   Algorithms/mitkClippedSurfaceBoundsCalculator.h
   Algorithms/mitkExtractSliceFilter.h
   Algorithms/mitkConvert2Dto3DImageFilter.h 
   DataManagement/mitkImageAccessByItk.h
   DataManagement/mitkImageCast.h
   DataManagement/mitkITKImageImport.h
   DataManagement/mitkITKImageImport.txx
   DataManagement/mitkImageToItk.h
   DataManagement/mitkImageToItk.txx
   
   Interfaces/mitkIDataNodeReader.h
 
   IO/mitkPixelTypeTraits.h
   
   Interactions/mitkEventMapperAddOn.h
   
   Common/mitkExceptionMacro.h
   Common/mitkTestingMacros.h
    
 )
 
 set(CPP_FILES
   Algorithms/mitkBaseDataSource.cpp
   Algorithms/mitkBaseProcess.cpp
   Algorithms/mitkDataNodeSource.cpp
   Algorithms/mitkGeometry2DDataToSurfaceFilter.cpp
   Algorithms/mitkHistogramGenerator.cpp
   Algorithms/mitkImageChannelSelector.cpp
   Algorithms/mitkImageSliceSelector.cpp
   Algorithms/mitkImageSource.cpp
   Algorithms/mitkImageTimeSelector.cpp
   Algorithms/mitkImageToImageFilter.cpp
   Algorithms/mitkPointSetSource.cpp
   Algorithms/mitkPointSetToPointSetFilter.cpp
   Algorithms/mitkRGBToRGBACastImageFilter.cpp
   Algorithms/mitkSubImageSelector.cpp
   Algorithms/mitkSurfaceSource.cpp
   Algorithms/mitkSurfaceToSurfaceFilter.cpp
   Algorithms/mitkUIDGenerator.cpp
   Algorithms/mitkVolumeCalculator.cpp
   Algorithms/mitkClippedSurfaceBoundsCalculator.cpp
   Algorithms/mitkExtractSliceFilter.cpp
   Algorithms/mitkConvert2Dto3DImageFilter.cpp
   Controllers/mitkBaseController.cpp
   Controllers/mitkCallbackFromGUIThread.cpp
   Controllers/mitkCameraController.cpp
   Controllers/mitkCameraRotationController.cpp
   Controllers/mitkCoreActivator.cpp
   Controllers/mitkFocusManager.cpp
   Controllers/mitkLimitedLinearUndo.cpp
   Controllers/mitkOperationEvent.cpp
   Controllers/mitkPlanePositionManager.cpp
   Controllers/mitkProgressBar.cpp
   Controllers/mitkRenderingManager.cpp
   Controllers/mitkSliceNavigationController.cpp
   Controllers/mitkSlicesCoordinator.cpp
   Controllers/mitkSlicesRotator.cpp
   Controllers/mitkSlicesSwiveller.cpp
   Controllers/mitkStatusBar.cpp
   Controllers/mitkStepper.cpp
   Controllers/mitkTestManager.cpp
   Controllers/mitkUndoController.cpp
   Controllers/mitkVerboseLimitedLinearUndo.cpp
   Controllers/mitkVtkInteractorCameraController.cpp
   Controllers/mitkVtkLayerController.cpp
   DataManagement/mitkAbstractTransformGeometry.cpp
   DataManagement/mitkAnnotationProperty.cpp
   DataManagement/mitkApplicationCursor.cpp
   DataManagement/mitkBaseData.cpp
   DataManagement/mitkBaseProperty.cpp
   DataManagement/mitkClippingProperty.cpp
   DataManagement/mitkChannelDescriptor.cpp
   DataManagement/mitkColorProperty.cpp
   DataManagement/mitkDataStorage.cpp
   #DataManagement/mitkDataTree.cpp
   DataManagement/mitkDataNode.cpp
   DataManagement/mitkDataNodeFactory.cpp
   #DataManagement/mitkDataTreeStorage.cpp
   DataManagement/mitkDisplayGeometry.cpp
   DataManagement/mitkEnumerationProperty.cpp
   DataManagement/mitkGeometry2D.cpp
   DataManagement/mitkGeometry2DData.cpp
   DataManagement/mitkGeometry3D.cpp
   DataManagement/mitkGeometryData.cpp
   DataManagement/mitkGroupTagProperty.cpp
   DataManagement/mitkImage.cpp
   DataManagement/mitkImageCaster.cpp
   DataManagement/mitkImageCastPart1.cpp
   DataManagement/mitkImageCastPart2.cpp
   DataManagement/mitkImageCastPart3.cpp
   DataManagement/mitkImageCastPart4.cpp
   DataManagement/mitkImageDataItem.cpp
   DataManagement/mitkImageDescriptor.cpp
   DataManagement/mitkImageStatisticsHolder.cpp
   DataManagement/mitkLandmarkBasedCurvedGeometry.cpp
   DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
   DataManagement/mitkLandmarkProjector.cpp
   DataManagement/mitkLevelWindow.cpp
   DataManagement/mitkLevelWindowManager.cpp
   DataManagement/mitkLevelWindowPreset.cpp
   DataManagement/mitkLevelWindowProperty.cpp
   DataManagement/mitkLookupTable.cpp
   DataManagement/mitkLookupTables.cpp # specializations of GenericLookupTable
   DataManagement/mitkMemoryUtilities.cpp
   DataManagement/mitkModalityProperty.cpp
   DataManagement/mitkModeOperation.cpp
   DataManagement/mitkNodePredicateAnd.cpp
   DataManagement/mitkNodePredicateBase.cpp
   DataManagement/mitkNodePredicateCompositeBase.cpp
   DataManagement/mitkNodePredicateData.cpp
   DataManagement/mitkNodePredicateDataType.cpp
   DataManagement/mitkNodePredicateDimension.cpp
   DataManagement/mitkNodePredicateFirstLevel.cpp
   DataManagement/mitkNodePredicateNot.cpp
   DataManagement/mitkNodePredicateOr.cpp
   DataManagement/mitkNodePredicateProperty.cpp
   DataManagement/mitkNodePredicateSource.cpp
   DataManagement/mitkPlaneOrientationProperty.cpp
   DataManagement/mitkPlaneGeometry.cpp
   DataManagement/mitkPlaneOperation.cpp
   DataManagement/mitkPointOperation.cpp
   DataManagement/mitkPointSet.cpp
   DataManagement/mitkProperties.cpp
   DataManagement/mitkPropertyList.cpp
   DataManagement/mitkRestorePlanePositionOperation.cpp
   DataManagement/mitkRotationOperation.cpp
   DataManagement/mitkSlicedData.cpp
   DataManagement/mitkSlicedGeometry3D.cpp
   DataManagement/mitkSmartPointerProperty.cpp
   DataManagement/mitkStandaloneDataStorage.cpp
   DataManagement/mitkStateTransitionOperation.cpp
   DataManagement/mitkStringProperty.cpp
   DataManagement/mitkSurface.cpp
   DataManagement/mitkSurfaceOperation.cpp
   DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
   DataManagement/mitkTimeSlicedGeometry.cpp
   DataManagement/mitkTransferFunction.cpp
   DataManagement/mitkTransferFunctionProperty.cpp
   DataManagement/mitkTransferFunctionInitializer.cpp
   DataManagement/mitkVector.cpp
   DataManagement/mitkVtkInterpolationProperty.cpp
   DataManagement/mitkVtkRepresentationProperty.cpp
   DataManagement/mitkVtkResliceInterpolationProperty.cpp
   DataManagement/mitkVtkScalarModeProperty.cpp
   DataManagement/mitkVtkVolumeRenderingProperty.cpp
   DataManagement/mitkWeakPointerProperty.cpp
   DataManagement/mitkShaderProperty.cpp
   DataManagement/mitkResliceMethodProperty.cpp
   DataManagement/mitkMaterial.cpp
   Interactions/mitkAction.cpp
   Interactions/mitkAffineInteractor.cpp
   Interactions/mitkCoordinateSupplier.cpp
   Interactions/mitkDisplayCoordinateOperation.cpp
   Interactions/mitkDisplayInteractor.cpp
   Interactions/mitkDisplayPositionEvent.cpp
   Interactions/mitkDisplayVectorInteractor.cpp
   Interactions/mitkDisplayVectorInteractorLevelWindow.cpp
   Interactions/mitkDisplayVectorInteractorScroll.cpp
   Interactions/mitkEvent.cpp
   Interactions/mitkEventDescription.cpp
   Interactions/mitkEventMapper.cpp
   Interactions/mitkGlobalInteraction.cpp
   Interactions/mitkInteractor.cpp
   Interactions/mitkMouseModeSwitcher.cpp
   Interactions/mitkMouseMovePointSetInteractor.cpp
   Interactions/mitkMoveSurfaceInteractor.cpp
   Interactions/mitkNodeDepententPointSetInteractor.cpp
   Interactions/mitkPointSetInteractor.cpp
   Interactions/mitkPositionEvent.cpp
   Interactions/mitkPositionTracker.cpp
   Interactions/mitkState.cpp
   Interactions/mitkStateEvent.cpp
   Interactions/mitkStateMachine.cpp
   Interactions/mitkStateMachineFactory.cpp
   Interactions/mitkTransition.cpp
   Interactions/mitkWheelEvent.cpp
   Interactions/mitkKeyEvent.cpp
   Interactions/mitkVtkEventAdapter.cpp
   Interactions/mitkVtkInteractorStyle.cxx
   Interactions/mitkCrosshairPositionEvent.cpp
   IO/mitkBaseDataIOFactory.cpp
   IO/mitkCoreDataNodeReader.cpp
   IO/mitkDicomSeriesReader.cpp
   IO/mitkFileReader.cpp
   IO/mitkFileSeriesReader.cpp
   IO/mitkFileWriter.cpp
   #IO/mitkIpPicGet.c
   IO/mitkImageGenerator.cpp
   IO/mitkImageWriter.cpp
   IO/mitkImageWriterFactory.cpp
   IO/mitkItkImageFileIOFactory.cpp
   IO/mitkItkImageFileReader.cpp
+  IO/mitkItkLoggingAdapter.cpp
   IO/mitkItkPictureWrite.cpp
   IO/mitkIOUtil.cpp
   IO/mitkLookupTableProperty.cpp
   IO/mitkOperation.cpp
   #IO/mitkPicFileIOFactory.cpp
   #IO/mitkPicFileReader.cpp
   #IO/mitkPicFileWriter.cpp
   #IO/mitkPicHelper.cpp
   #IO/mitkPicVolumeTimeSeriesIOFactory.cpp
   #IO/mitkPicVolumeTimeSeriesReader.cpp
   IO/mitkPixelType.cpp
   IO/mitkPointSetIOFactory.cpp
   IO/mitkPointSetReader.cpp
   IO/mitkPointSetWriter.cpp
   IO/mitkPointSetWriterFactory.cpp
   IO/mitkRawImageFileReader.cpp
   IO/mitkStandardFileLocations.cpp
   IO/mitkSTLFileIOFactory.cpp
   IO/mitkSTLFileReader.cpp
   IO/mitkSurfaceVtkWriter.cpp
   IO/mitkSurfaceVtkWriterFactory.cpp
   IO/mitkVtkLoggingAdapter.cpp
   IO/mitkVtiFileIOFactory.cpp
   IO/mitkVtiFileReader.cpp
   IO/mitkVtkImageIOFactory.cpp
   IO/mitkVtkImageReader.cpp
   IO/mitkVtkSurfaceIOFactory.cpp
   IO/mitkVtkSurfaceReader.cpp
   IO/vtkPointSetXMLParser.cpp
   IO/mitkLog.cpp
   Rendering/mitkBaseRenderer.cpp
   Rendering/mitkVtkMapper2D.cpp
   Rendering/mitkVtkMapper3D.cpp
   Rendering/mitkRenderWindowFrame.cpp
   Rendering/mitkGeometry2DDataMapper2D.cpp
   Rendering/mitkGeometry2DDataVtkMapper3D.cpp
   Rendering/mitkGLMapper2D.cpp
   Rendering/mitkGradientBackground.cpp
   Rendering/mitkManufacturerLogo.cpp
   Rendering/mitkMapper2D.cpp
   Rendering/mitkMapper3D.cpp
   Rendering/mitkMapper.cpp
   Rendering/mitkPointSetGLMapper2D.cpp
   Rendering/mitkPointSetVtkMapper3D.cpp
   Rendering/mitkPolyDataGLMapper2D.cpp
   Rendering/mitkSurfaceGLMapper2D.cpp
   Rendering/mitkSurfaceVtkMapper3D.cpp
   Rendering/mitkVolumeDataVtkMapper3D.cpp
   Rendering/mitkVtkPropRenderer.cpp
   Rendering/mitkVtkWidgetRendering.cpp
   Rendering/vtkMitkRectangleProp.cpp
   Rendering/vtkMitkRenderProp.cpp
   Rendering/mitkVtkEventProvider.cpp
   Rendering/mitkRenderWindow.cpp
   Rendering/mitkRenderWindowBase.cpp
   Rendering/mitkShaderRepository.cpp
   Rendering/mitkImageVtkMapper2D.cpp
   Rendering/vtkMitkThickSlicesFilter.cpp
   Rendering/vtkMitkApplyLevelWindowToRGBFilter.cpp
 
   Common/mitkException.cpp
   Common/mitkCommon.h
   Common/mitkCoreObjectFactoryBase.cpp
   Common/mitkCoreObjectFactory.cpp
 )
 
 list(APPEND CPP_FILES ${CppMicroServices_SOURCES})
diff --git a/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.cpp
index 0660cdc951..5376638a94 100644
--- a/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.cpp
+++ b/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.cpp
@@ -1,275 +1,277 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center, 
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without 
 even the implied warranty of MERCHANTABILITY or FITNESS FOR 
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "mitkPluginActivator.h"
 
 #include "mitkLog.h"
 
 #include <QString>
 #include <QFileInfo>
 
 #include "internal/mitkDataStorageService.h"
 
 #include <mitkModuleRegistry.h>
 #include <mitkModule.h>
 #include <mitkModuleContext.h>
 #include <mitkVtkLoggingAdapter.h>
+#include <mitkItkLoggingAdapter.h>
 
 
 namespace mitk
 {
 
 class ITKLightObjectToQObjectAdapter : public QObject
 {
 
 public:
 
   ITKLightObjectToQObjectAdapter(const QStringList& clazzes, itk::LightObject* service)
     : interfaceNames(clazzes), mitkService(service)
   {}
 
   // This method is called by the Qt meta object system. It is usually
   // generated by the moc, but we create it manually to be able to return
   // a MITK micro service object (derived from itk::LightObject). It basically
   // works as if the micro service class had used the Q_INTERFACES macro in
   // its declaration. Now we can successfully do a
   // qobject_cast<mitk::SomeMicroServiceInterface>(lightObjectToQObjectAdapter)
   void* qt_metacast(const char *_clname)
   {
     if (!_clname) return 0;
     if (!strcmp(_clname, "ITKLightObjectToQObjectAdapter"))
       return static_cast<void*>(const_cast<ITKLightObjectToQObjectAdapter*>(this));
     if (interfaceNames.contains(QString(_clname)))
       return static_cast<void*>(mitkService);
     return QObject::qt_metacast(_clname);
   }
 
 private:
 
   QStringList interfaceNames;
   itk::LightObject* mitkService;
 };
 
 const std::string org_mitk_core_services_Activator::PLUGIN_ID = "org.mitk.core.services";
 
 void org_mitk_core_services_Activator::start(ctkPluginContext* context)
 {
   pluginContext = context;
 
   //initialize logging
   mitk::LoggingBackend::Register(); 
   QString filename = "mitk.log";
   QFileInfo path = context->getDataFile(filename);
   mitk::LoggingBackend::SetLogFile(path.absoluteFilePath().toStdString().c_str());
   mitk::VtkLoggingAdapter::Initialize();
+  mitk::ItkLoggingAdapter::Initialize();
 
   //initialize data storage service
   DataStorageService* service = new DataStorageService();
   dataStorageService = IDataStorageService::Pointer(service);
   context->registerService<mitk::IDataStorageService>(service);
 
   // Get the MitkCore Module Context
   mitkContext = mitk::ModuleRegistry::GetModule(1)->GetModuleContext();
 
   // Process all already registered services
   std::list<mitk::ServiceReference> refs = mitkContext->GetServiceReferences("");
   for (std::list<mitk::ServiceReference>::const_iterator i = refs.begin();
        i != refs.end(); ++i)
   {
     this->AddMitkService(*i);
   }
 
   mitkContext->AddServiceListener(this, &org_mitk_core_services_Activator::MitkServiceChanged);
 }
 
 void org_mitk_core_services_Activator::stop(ctkPluginContext* /*context*/)
 {
   mitkContext->RemoveServiceListener(this, &org_mitk_core_services_Activator::MitkServiceChanged);
 
   foreach(ctkServiceRegistration reg, mapMitkIdToRegistration.values())
   {
     reg.unregister();
   }
   mapMitkIdToRegistration.clear();
 
   qDeleteAll(mapMitkIdToAdapter);
   mapMitkIdToAdapter.clear();
 
   //clean up logging
   mitk::LoggingBackend::Unregister();
   
   dataStorageService = 0;
   mitkContext = 0;
   pluginContext = 0;
 }
 
 void org_mitk_core_services_Activator::MitkServiceChanged(const mitk::ServiceEvent event)
 {
   switch (event.GetType())
   {
   case mitk::ServiceEvent::REGISTERED:
   {
     this->AddMitkService(event.GetServiceReference());
     break;
   }
   case mitk::ServiceEvent::UNREGISTERING:
   {
     long mitkServiceId = mitk::any_cast<long>(event.GetServiceReference().GetProperty(mitk::ServiceConstants::SERVICE_ID()));
     ctkServiceRegistration reg = mapMitkIdToRegistration.take(mitkServiceId);
     if (reg)
     {
       reg.unregister();
     }
     delete mapMitkIdToAdapter.take(mitkServiceId);
     break;
   }
   case mitk::ServiceEvent::MODIFIED:
   {
     long mitkServiceId = mitk::any_cast<long>(event.GetServiceReference().GetProperty(mitk::ServiceConstants::SERVICE_ID()));
     ctkDictionary newProps = CreateServiceProperties(event.GetServiceReference());
     mapMitkIdToRegistration[mitkServiceId].setProperties(newProps);
     break;
   }
   default:
     break; // do nothing
   }
 }
 
 void org_mitk_core_services_Activator::AddMitkService(const mitk::ServiceReference& ref)
 {
   // Get the MITK micro service object
   itk::LightObject* mitkService = mitkContext->GetService(ref);
   if (mitkService == 0) return;
 
   // Get the interface names against which the service was registered
   std::list<std::string> clazzes =
       mitk::any_cast<std::list<std::string> >(ref.GetProperty(mitk::ServiceConstants::OBJECTCLASS()));
 
   QStringList qclazzes;
   for(std::list<std::string>::const_iterator clazz = clazzes.begin();
       clazz != clazzes.end(); ++clazz)
   {
     qclazzes << QString::fromStdString(*clazz);
   }
 
   long mitkServiceId = mitk::any_cast<long>(ref.GetProperty(mitk::ServiceConstants::SERVICE_ID()));
 
   QObject* adapter = new ITKLightObjectToQObjectAdapter(qclazzes, mitkService);
   mapMitkIdToAdapter[mitkServiceId] = adapter;
 
   ctkDictionary props = CreateServiceProperties(ref);
   mapMitkIdToRegistration[mitkServiceId] = pluginContext->registerService(qclazzes, adapter, props);
 }
 
 ctkDictionary org_mitk_core_services_Activator::CreateServiceProperties(const ServiceReference &ref)
 {
   ctkDictionary props;
 
   long mitkServiceId = mitk::any_cast<long>(ref.GetProperty(mitk::ServiceConstants::SERVICE_ID()));
   props.insert("mitk.serviceid", QVariant::fromValue(mitkServiceId));
 
   // Add all other properties from the MITK micro service
   std::vector<std::string> keys;
   ref.GetPropertyKeys(keys);
   for (std::vector<std::string>::const_iterator it = keys.begin(); it != keys.end(); ++it)
   {
     QString key = QString::fromStdString(*it);
     mitk::Any value = ref.GetProperty(*it);
     // We cannot add any mitk::Any object, we need to query the type
     const std::type_info& objType = value.Type();
     if (objType == typeid(std::string))
     {
       props.insert(key, QString::fromStdString(ref_any_cast<std::string>(value)));
     }
     else if (objType == typeid(std::vector<std::string>))
     {
       const std::vector<std::string>& list = ref_any_cast<std::vector<std::string> >(value);
       QStringList qlist;
       for (std::vector<std::string>::const_iterator str = list.begin();
            str != list.end(); ++str)
       {
          qlist << QString::fromStdString(*str);
       }
       props.insert(key, qlist);
     }
     else if (objType == typeid(std::list<std::string>))
     {
       const std::list<std::string>& list = ref_any_cast<std::list<std::string> >(value);
       QStringList qlist;
       for (std::list<std::string>::const_iterator str = list.begin();
            str != list.end(); ++str)
       {
          qlist << QString::fromStdString(*str);
       }
       props.insert(key, qlist);
     }
     else if (objType == typeid(char))
     {
       props.insert(key, QChar(ref_any_cast<char>(value)));
     }
     else if (objType == typeid(unsigned char))
     {
       props.insert(key, QChar(ref_any_cast<unsigned char>(value)));
     }
     else if (objType == typeid(bool))
     {
       props.insert(key, any_cast<bool>(value));
     }
     else if (objType == typeid(short))
     {
       props.insert(key, any_cast<short>(value));
     }
     else if (objType == typeid(unsigned short))
     {
       props.insert(key, any_cast<unsigned short>(value));
     }
     else if (objType == typeid(int))
     {
       props.insert(key, any_cast<int>(value));
     }
     else if (objType == typeid(unsigned int))
     {
       props.insert(key, any_cast<unsigned int>(value));
     }
     else if (objType == typeid(float))
     {
       props.insert(key, any_cast<float>(value));
     }
     else if (objType == typeid(double))
     {
       props.insert(key, any_cast<double>(value));
     }
     else if (objType == typeid(long long int))
     {
       props.insert(key, any_cast<long long int>(value));
     }
     else if (objType == typeid(unsigned long long int))
     {
       props.insert(key, any_cast<unsigned long long int>(value));
     }
   }
 
   return props;
 }
 
 org_mitk_core_services_Activator::org_mitk_core_services_Activator()
   : mitkContext(0), pluginContext(0)
 {
 }
 
 }
 
 Q_EXPORT_PLUGIN2(org_mitk_core_services, mitk::org_mitk_core_services_Activator)