NEWS: updated.

NEWS: updated.

* configure.in: added include/cppunit/config/Makefile and
include/cppunit/plugin/Makefile to the list of target.

* doc/CppUnit-win.dox: enabled generation of HTML Help documentation.

* include/cppunit/config/Makefile.am:
* include/cppunit/plugin/Makefile.am: added.

* include/cppunit/config-bcb5.h:
* include/cppunit/config-msvc6.h:
* include/cppunit/config-mac.h: moved to include/cppunit/config/.

* include/cppunit/Portability.h: updated config files location. Added macros
CPPUNIT_STRINGIZE and CPPUNIT_JOIN (implementation adapted from boost.org).
Added macro CPPUNIT_MAKE_UNIQUE_NAME.

* include/cppunit/Test.h: modified methods order.

* include/cppunit/extensions/HelperMacros.h: renamed macro
__CPPUNIT_MAKE_UNIQUE_NAME to CPPUNIT_MAKE_UNIQUE_NAME and moved its
definition to include/cppunit/Portability.h.

* include/cppunit/extensions/TestDecorator.h: Inherits Test instead of TestLeaf.

* include/cppunit/plugin/DynamicLibraryManager.h:
* src/cppunit/DynamicLibraryManager.cpp: added. DLL manager (load & lookup
symbol).

* src/cppunit/BeOsDynamicLibraryManager.cpp:
* src/cppunit/UnixDynamicLibraryManager.cpp:
* src/cppunit/Win32DynamicLibraryManager.cpp: added. Implementation of
platform dependent methods of DynamicLibraryManager.

* include/cppunit/plugin/DynamicLibraryManagerException.h:
* src/cppunit/DynamicLibraryManagerException.cpp: added. Exception thrown
by DynamicLibraryManager.

* include/cppunit/plugin/TestPlugIn.h: added. CppUnitTestPlugIn interface
definition. Helper macros to implements plug-in.

* include/cppunit/plugin/TestPlugInSuite.h:
* src/cppunit/plugin/TestPlugInSuite.cpp: added. A suite to wrap a test
plug-in.

* include/cppunit/plugin/TestPlugInDefaultImpl.h:
* src/cppunit/TestPlugInDefaultImpl.cpp: added. A default implementation
of the test plug-in interface.

* src/msvc6/DllPlugInTester/DllPlugInTester.cpp: updated to use the
new TestPlugIn.

* examples/cppunittest/TestResultCollectorTest.cpp: fixed typo.

10 files changed, 618 insertions, 107 deletions

diff --git a/src/cppunit/BeOsDynamicLibraryManager.cpp b/src/cppunit/BeOsDynamicLibraryManager.cpp
new file mode 100644
index 0000000..fe5db9f
--- /dev/null
+++ b/src/cppunit/BeOsDynamicLibraryManager.cpp
@@ -0,0 +1,43 @@
+#include <cppunit/Portability.h>
+
+#if defined(CPPUNIT_HAVE_BEOS_DLL_LOADER)
+#include <cppunit/plugin/DynamicLibraryManager.h>
+
+#include <kernel/image.h>
+
+
+namespace CppUnit
+{
+
+
+DynamicLibraryManager::LibraryHandle 
+DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
+{
+  return (LibraryHandle)::load_add_on( libraryName.c_str() );
+}
+
+
+void 
+DynamicLibraryManager::doReleaseLibrary()
+{
+  return ::unload_add_on( (image_id)m_libraryHandle ) == B_OK;
+}
+
+
+DynamicLibraryManager::Symbol 
+DynamicLibraryManager::doFindSymbol( const std::string &symbol )
+{
+  void *symbolPointer;
+  if ( ::get_image_symbol( (image_id)m_libraryHandle, 
+                           symbol.c_str(), 
+                           B_SYMBOL_TYPE_TEXT, 
+                           &symbolPointer ) == B_OK )
+    return symnolPointer;
+  return NULL;
+}
+
+
+} //  namespace CppUnit
+
+
+#endif // defined(CPPUNIT_HAVE_BEOS_DLL_LOADER)
\ No newline at end of file
diff --git a/src/cppunit/DynamicLibraryManager.cpp b/src/cppunit/DynamicLibraryManager.cpp
new file mode 100644
index 0000000..1c92e3e
--- /dev/null
+++ b/src/cppunit/DynamicLibraryManager.cpp
@@ -0,0 +1,73 @@
+#include <cppunit/plugin/DynamicLibraryManager.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+#include <cppunit/plugin/DynamicLibraryManagerException.h>
+
+namespace CppUnit
+{
+
+
+DynamicLibraryManager::DynamicLibraryManager( const std::string &libraryFileName )
+    : m_libraryHandle( NULL )
+{
+  loadLibrary( libraryFileName );
+}
+
+
+DynamicLibraryManager::~DynamicLibraryManager()
+{
+  releaseLibrary();
+}
+
+
+DynamicLibraryManager::Symbol 
+DynamicLibraryManager::findSymbol( const std::string &symbol )
+{
+  try
+  {
+    Symbol symbolPointer = doFindSymbol( symbol );
+    if ( symbolPointer != NULL )
+      return symbolPointer;
+  }
+  catch ( ... )
+  {
+  }
+
+  throw DynamicLibraryManagerException( m_libraryName, symbol );
+  return NULL;    // keep compiler happy
+}
+
+
+void
+DynamicLibraryManager::loadLibrary( const std::string &libraryName )
+{
+  try
+  {
+    releaseLibrary();
+     m_libraryHandle = doLoadLibrary( libraryName );
+    if ( m_libraryHandle != NULL )
+      return;
+  }
+  catch (...)
+  {
+  }
+
+  throw DynamicLibraryManagerException( m_libraryName );
+}
+
+
+void 
+DynamicLibraryManager::releaseLibrary()
+{
+  if ( m_libraryHandle != NULL )
+  {
+    doReleaseLibrary();
+    m_libraryHandle = NULL;
+  }
+}
+
+
+} //  namespace CppUnit
+
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
diff --git a/src/cppunit/DynamicLibraryManagerException.cpp b/src/cppunit/DynamicLibraryManagerException.cpp
new file mode 100644
index 0000000..44a7e62
--- /dev/null
+++ b/src/cppunit/DynamicLibraryManagerException.cpp
@@ -0,0 +1,37 @@
+#include <cppunit/plugin/DynamicLibraryManagerException.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+
+namespace CppUnit
+{
+
+
+DynamicLibraryManagerException::DynamicLibraryManagerException( 
+                                         const std::string &libraryName )
+    : m_cause( loadingFailed )
+    , std::runtime_error( "Failed to load dynamic library: " + libraryName )
+{
+}
+
+
+DynamicLibraryManagerException::DynamicLibraryManagerException( 
+                                const std::string &libraryName,
+                                const std::string &symbol )
+    : m_cause( symbolNotFound )
+    , std::runtime_error( "Symbol [" + symbol + "] not found in dynamic libary:" +
+                          libraryName )
+{
+}
+
+
+DynamicLibraryManagerException::Cause 
+DynamicLibraryManagerException::getCause() const
+{
+  return m_cause;
+}
+
+
+} //  namespace CppUnit
+
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
diff --git a/src/cppunit/Makefile.am b/src/cppunit/Makefile.am
index 83645df..f0b4b77 100644
--- a/src/cppunit/Makefile.am
+++ b/src/cppunit/Makefile.am
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.am,v 1.22 2002-04-13 15:26:55 blep Exp $
+# $Id: Makefile.am,v 1.23 2002-04-15 15:30:34 blep Exp $
 #
 
 EXTRA_DIST = cppunit.dsp cppunit_dll.dsp DllMain.cpp
@@ -9,7 +9,10 @@ lib_LTLIBRARIES = libcppunit.la
 
 libcppunit_la_SOURCES = \
   Asserter.cpp \
+  BeosDynamicLibraryManager.cpp \
   CompilerOutputter.cpp \
+  DynamicLibraryManager.cpp \
+  DynamicLibraryManagerException.cpp \
   Exception.cpp \
   NotEqualException.cpp \
   RepeatedTest.cpp \
@@ -23,6 +26,8 @@ libcppunit_la_SOURCES = \
   TestFailure.cpp \
   TestLeaf.cpp \
   TestPath.cpp \
+  TestPlugInDefaultImpl.cpp \
+  TestPlugInSuite.cpp \
   TestResult.cpp \
   TestResultCollector.cpp \
   TestRunner.cpp \
@@ -34,7 +39,9 @@ libcppunit_la_SOURCES = \
   TextTestResult.cpp \
   TextTestRunner.cpp \
   TypeInfoHelper.cpp \
-  XmlOutputter.cpp
+  UnixDynamicLibraryManager.cpp \
+  XmlOutputter.cpp \
+  Win32DynamicLibraryManager.cpp
 
 libcppunit_la_LDFLAGS= \
  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
diff --git a/src/cppunit/TestPlugInDefaultImpl.cpp b/src/cppunit/TestPlugInDefaultImpl.cpp
new file mode 100644
index 0000000..d6bd117
--- /dev/null
+++ b/src/cppunit/TestPlugInDefaultImpl.cpp
@@ -0,0 +1,59 @@
+#include <cppunit/Portability.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/TestSuite.h>
+#include <cppunit/plugin/TestPlugInDefaultImpl.h>
+
+
+namespace CppUnit
+{
+
+TestPlugInDefaultImpl::TestPlugInDefaultImpl() 
+    : m_suite( NULL )
+{
+}
+
+
+TestPlugInDefaultImpl::~TestPlugInDefaultImpl()
+{
+  delete m_suite;
+  m_suite = NULL;
+}
+
+
+void 
+TestPlugInDefaultImpl::initialize() 
+{
+  m_suite = new TestSuite( getSuiteName() );
+  TestFactoryRegistry::getRegistry().addTestToSuite( m_suite );
+}
+
+
+Test *
+TestPlugInDefaultImpl::getTestSuite()
+{
+  return m_suite;
+}
+
+
+void 
+TestPlugInDefaultImpl::uninitialize()
+{
+  delete m_suite;
+  m_suite = NULL;
+}
+
+
+std::string 
+TestPlugInDefaultImpl::getSuiteName()
+{
+  return "All Tests";
+}
+
+
+}  // namespace CppUnit
+
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
diff --git a/src/cppunit/TestPlugInSuite.cpp b/src/cppunit/TestPlugInSuite.cpp
new file mode 100644
index 0000000..a8fea7a
--- /dev/null
+++ b/src/cppunit/TestPlugInSuite.cpp
@@ -0,0 +1,59 @@
+#include <cppunit/plugin/TestPlugInSuite.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+
+#include <cppunit/plugin/DynamicLibraryManager.h>
+
+
+namespace CppUnit
+{
+
+
+TestPlugInSuite::TestPlugInSuite( const std::string &libraryFileName )
+    : m_library( new DynamicLibraryManager( libraryFileName ) )
+    , m_librarySuite( NULL )
+    , m_interface( NULL )
+{
+  try
+  {
+    CppUnitTestPlugInSignature plug = (CppUnitTestPlugInSignature)m_library->findSymbol( 
+          CPPUNIT_STRINGIZE( CPPUNIT_PLUGIN_EXPORTED_NAME ) );
+    m_interface = (*plug)();
+    m_interface->initialize();
+    m_librarySuite = m_interface->getTestSuite();
+  }
+  catch( ... )
+  {
+    delete m_library;
+    m_library = NULL;
+    throw;
+  }
+}
+
+
+TestPlugInSuite::~TestPlugInSuite()
+{
+  if ( m_interface )
+    m_interface->uninitialize();
+  delete m_library;
+}
+
+
+int 
+TestPlugInSuite::getChildTestCount() const
+{
+  return m_librarySuite->getChildTestCount();
+}
+
+
+Test *
+TestPlugInSuite::doGetChildTestAt( int index ) const
+{
+  return m_librarySuite->getChildTestAt( index );
+}
+
+
+} //  namespace CppUnit
+
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
\ No newline at end of file
diff --git a/src/cppunit/UnixDynamicLibraryManager.cpp b/src/cppunit/UnixDynamicLibraryManager.cpp
new file mode 100644
index 0000000..0baca5d
--- /dev/null
+++ b/src/cppunit/UnixDynamicLibraryManager.cpp
@@ -0,0 +1,38 @@
+#include <cppunit/Portability.h>
+
+#if defined(CPPUNIT_HAVE_UNIX_DLL_LOADER)
+#include <cppunit/plugin/DynamicLibraryManager.h>
+
+#include <dlfcn.h>
+#include <unistd.h>
+
+
+namespace CppUnit
+{
+
+
+DynamicLibraryManager::LibraryHandle 
+DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
+{
+  return ::dlopen( libraryFileName.c_str(), DLOPEN_MODE );
+}
+
+
+void 
+DynamicLibraryManager::doReleaseLibrary()
+{
+  ::dlclose( m_libraryHandle);
+}
+
+
+DynamicLibraryManager::Symbol 
+DynamicLibraryManager::doFindSymbol( const std::string &symbol )
+{
+  return ::dlsym ( m_libraryHandle, symbol.c_str() );
+}
+
+
+} //  namespace CppUnit
+
+
+#endif // defined(CPPUNIT_HAVE_UNIX_DLL_LOADER)
diff --git a/src/cppunit/Win32DynamicLibraryManager.cpp b/src/cppunit/Win32DynamicLibraryManager.cpp
new file mode 100644
index 0000000..2c4ec03
--- /dev/null
+++ b/src/cppunit/Win32DynamicLibraryManager.cpp
@@ -0,0 +1,43 @@
+#include <cppunit/Portability.h>
+
+#if defined(CPPUNIT_HAVE_WIN32_DLL_LOADER)
+#include <cppunit/plugin/DynamicLibraryManager.h>
+
+#define WIN32_LEAN_AND_MEAN 
+#define NOGDI
+#define NOUSER
+#define NOKERNEL
+#define NOSOUND
+#define NOMINMAX
+#include <windows.h>
+
+
+namespace CppUnit
+{
+
+
+DynamicLibraryManager::LibraryHandle 
+DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
+{
+  return ::LoadLibrary( libraryName.c_str() );
+}
+
+
+void 
+DynamicLibraryManager::doReleaseLibrary()
+{
+  ::FreeLibrary( (HINSTANCE)m_libraryHandle );
+}
+
+
+DynamicLibraryManager::Symbol 
+DynamicLibraryManager::doFindSymbol( const std::string &symbol )
+{
+  return ::GetProcAddress( (HINSTANCE)m_libraryHandle, symbol.c_str() );
+}
+
+
+} //  namespace CppUnit
+
+
+#endif // defined(CPPUNIT_HAVE_WIN32_DLL_LOADER)
\ No newline at end of file
diff --git a/src/cppunit/cppunit.dsp b/src/cppunit/cppunit.dsp
index eeb8d24..d38f5ef 100644
--- a/src/cppunit/cppunit.dsp
+++ b/src/cppunit/cppunit.dsp
@@ -105,76 +105,184 @@ LIB32=link.exe -lib
 # Name "cppunit - Win32 Release"
 # Name "cppunit - Win32 Debug"
 # Name "cppunit - Win32 Debug Crossplatform Setting"
-# Begin Group "extension"
+# Begin Group "plugin"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\extensions\Orthodox.h
+SOURCE=.\BeosDynamicLibraryManager.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\RepeatedTest.cpp
+SOURCE=.\DynamicLibraryManager.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\extensions\RepeatedTest.h
+SOURCE=..\..\include\cppunit\plugin\DynamicLibraryManager.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\extensions\TestDecorator.h
+SOURCE=.\DynamicLibraryManagerException.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\TestSetUp.cpp
+SOURCE=..\..\include\cppunit\plugin\DynamicLibraryManagerException.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\extensions\TestSetUp.h
+SOURCE=..\..\include\cppunit\plugin\TestPlugIn.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestPlugInDefaultImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\plugin\TestPlugInDefaultImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestPlugInSuite.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\plugin\TestPlugInSuite.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\UnixDynamicLibraryManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Win32DynamicLibraryManager.cpp
 # End Source File
 # End Group
-# Begin Group "helper"
+# Begin Group "documentation"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\extensions\AutoRegisterSuite.h
+SOURCE=..\..\ChangeLog
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\extensions\HelperMacros.h
+SOURCE=..\..\doc\cookbook.dox
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\TestCaller.h
+SOURCE=..\..\doc\FAQ
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\extensions\TestFactory.h
+SOURCE=..\..\NEWS
 # End Source File
 # Begin Source File
 
-SOURCE=.\TestFactoryRegistry.cpp
+SOURCE=..\..\doc\other_documentation.dox
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\extensions\TestFactoryRegistry.h
+SOURCE=..\..\TODO
 # End Source File
+# End Group
+# Begin Group "listener"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\extensions\TestSuiteBuilder.h
+SOURCE=.\TestSuccessListener.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\extensions\TestSuiteFactory.h
+SOURCE=.\TextTestProgressListener.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\TypeInfoHelper.cpp
+SOURCE=..\..\include\cppunit\TextTestProgressListener.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\extensions\TypeInfoHelper.h
+SOURCE=.\TextTestResult.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\TextTestResult.h
+# End Source File
+# End Group
+# Begin Group "textui"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\TextTestRunner.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\TextTestRunner.h
+# End Source File
+# End Group
+# Begin Group "portability"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\..\include\cppunit\config\config-bcb5.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\include\cppunit\config\config-mac.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\include\cppunit\config\config-msvc6.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\Portability.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\config\SelectDllLoader.h
+# End Source File
+# End Group
+# Begin Group "output"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\CompilerOutputter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\CompilerOutputter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\Outputter.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestResultCollector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\TestResultCollector.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TextOutputter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\TextOutputter.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\XmlOutputter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\XmlOutputter.h
 # End Source File
 # End Group
 # Begin Group "core"
@@ -309,121 +417,76 @@ SOURCE=.\TestSuite.cpp
 SOURCE=..\..\include\cppunit\TestSuite.h
 # End Source File
 # End Group
-# Begin Group "output"
+# Begin Group "helper"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\CompilerOutputter.cpp
-# SUBTRACT CPP /YX
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\cppunit\CompilerOutputter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\cppunit\Outputter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestResultCollector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\cppunit\TestResultCollector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TextOutputter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\cppunit\TextOutputter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\XmlOutputter.cpp
+SOURCE=..\..\include\cppunit\extensions\AutoRegisterSuite.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\XmlOutputter.h
+SOURCE=..\..\include\cppunit\extensions\HelperMacros.h
 # End Source File
-# End Group
-# Begin Group "portability"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE="..\..\include\cppunit\config-msvc6.h"
+SOURCE=..\..\include\cppunit\TestCaller.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\Portability.h
+SOURCE=..\..\include\cppunit\extensions\TestFactory.h
 # End Source File
-# End Group
-# Begin Group "textui"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\TextTestRunner.cpp
+SOURCE=.\TestFactoryRegistry.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\TextTestRunner.h
-# End Source File
-# End Group
-# Begin Group "listener"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\TestSuccessListener.cpp
+SOURCE=..\..\include\cppunit\extensions\TestFactoryRegistry.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\TextTestProgressListener.cpp
+SOURCE=..\..\include\cppunit\extensions\TestSuiteBuilder.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\TextTestProgressListener.h
+SOURCE=..\..\include\cppunit\extensions\TestSuiteFactory.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\TextTestResult.cpp
+SOURCE=.\TypeInfoHelper.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\TextTestResult.h
+SOURCE=..\..\include\cppunit\extensions\TypeInfoHelper.h
 # End Source File
 # End Group
-# Begin Group "documentation"
+# Begin Group "extension"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\ChangeLog
+SOURCE=..\..\include\cppunit\extensions\Orthodox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\doc\cookbook.dox
+SOURCE=.\RepeatedTest.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\doc\FAQ
+SOURCE=..\..\include\cppunit\extensions\RepeatedTest.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\NEWS
+SOURCE=..\..\include\cppunit\extensions\TestDecorator.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\doc\other_documentation.dox
+SOURCE=.\TestSetUp.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\TODO
+SOURCE=..\..\include\cppunit\extensions\TestSetUp.h
 # End Source File
 # End Group
 # Begin Source File
diff --git a/src/cppunit/cppunit_dll.dsp b/src/cppunit/cppunit_dll.dsp
index a28f46d..5960ecc 100644
--- a/src/cppunit/cppunit_dll.dsp
+++ b/src/cppunit/cppunit_dll.dsp
@@ -70,7 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_BUILD_DLL" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_BUILD_DLL" /FD /GZ /c
+# SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
@@ -89,6 +90,14 @@ LINK32=link.exe
 
 # Name "cppunit_dll - Win32 Release"
 # Name "cppunit_dll - Win32 Debug"
+# Begin Group "DllSpecific"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\DllMain.cpp
+# End Source File
+# End Group
 # Begin Group "extension"
 
 # PROP Default_Filter ""
@@ -278,6 +287,14 @@ SOURCE=..\..\include\cppunit\TestResult.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\TestRunner.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\TestRunner.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\TestSuite.cpp
 # End Source File
 # Begin Source File
@@ -310,19 +327,63 @@ SOURCE=..\..\include\cppunit\TestResultCollector.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\TestSuccessListener.cpp
+SOURCE=.\TextOutputter.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\TestSuccessListener.h
+SOURCE=..\..\include\cppunit\TextOutputter.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\TextOutputter.cpp
+SOURCE=.\XmlOutputter.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\TextOutputter.h
+SOURCE=..\..\include\cppunit\XmlOutputter.h
+# End Source File
+# End Group
+# Begin Group "portability"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\..\include\cppunit\config\config-bcb5.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\include\cppunit\config\config-mac.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\include\cppunit\config\config-msvc6.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\Portability.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\config\SelectDllLoader.h
+# End Source File
+# End Group
+# Begin Group "textui"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\TextTestRunner.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\TextTestRunner.h
+# End Source File
+# End Group
+# Begin Group "listener"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\TestSuccessListener.cpp
 # End Source File
 # Begin Source File
 
@@ -340,70 +401,98 @@ SOURCE=.\TextTestResult.cpp
 
 SOURCE=..\..\include\cppunit\TextTestResult.h
 # End Source File
+# End Group
+# Begin Group "documentation"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\XmlOutputter.cpp
+SOURCE=..\..\ChangeLog
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\XmlOutputter.h
+SOURCE=..\..\doc\cookbook.dox
 # End Source File
-# End Group
-# Begin Group "portability"
+# Begin Source File
 
-# PROP Default_Filter ""
+SOURCE=..\..\doc\FAQ
+# End Source File
 # Begin Source File
 
-SOURCE="..\..\include\cppunit\config-msvc6.h"
+SOURCE=..\..\NEWS
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\Portability.h
+SOURCE=..\..\doc\other_documentation.dox
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\TODO
 # End Source File
 # End Group
-# Begin Group "textui"
+# Begin Group "plugin"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\TestRunner.cpp
+SOURCE=.\BeosDynamicLibraryManager.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\ui\text\TestRunner.h
+SOURCE=.\DynamicLibraryManager.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\TextTestRunner.cpp
+SOURCE=..\..\include\cppunit\plugin\DynamicLibraryManager.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\TextTestRunner.h
+SOURCE=.\DynamicLibraryManagerException.cpp
 # End Source File
-# End Group
 # Begin Source File
 
-SOURCE=..\..\ChangeLog
+SOURCE=..\..\include\cppunit\plugin\DynamicLibraryManagerException.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\DllMain.cpp
+SOURCE=..\..\include\cppunit\plugin\TestPlugIn.h
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\INSTALL-WIN32.txt"
+SOURCE=.\TestPlugInDefaultImpl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\Makefile.am
+SOURCE=..\..\include\cppunit\plugin\TestPlugInDefaultImpl.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\Makefile.am
+SOURCE=.\TestPlugInSuite.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\NEWS
+SOURCE=..\..\include\cppunit\plugin\TestPlugInSuite.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\UnixDynamicLibraryManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Win32DynamicLibraryManager.cpp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE="..\..\INSTALL-WIN32.txt"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\Makefile.am
+# End Source File
+# Begin Source File
+
+SOURCE=.\Makefile.am
 # End Source File
 # End Target
 # End Project