ChangeLogTag: Mon Nov 25 04:25:15 2002 Krishnakumar B <kitty@cs.wustl.edu>

13 files changed, 513 insertions, 8 deletions

diff --git a/ACEXML/compass/AssemblyFactory.cpp b/ACEXML/compass/AssemblyFactory.cpp
index a8f4bd5b5d2..5a4f3b1afd4 100644
--- a/ACEXML/compass/AssemblyFactory.cpp
+++ b/ACEXML/compass/AssemblyFactory.cpp
@@ -36,6 +36,7 @@ AssemblyFactory::create (const Location& assembly_loc)
 
 Assembly*
 AssemblyFactory::lookup (const Cookie& c)
+  ACE_THROW_SPEC ((InvalidAssembly))
 {
   Assembly* asm = 0;
   if (this->cookies_->find (c, asm) != 0)
@@ -45,9 +46,10 @@ AssemblyFactory::lookup (const Cookie& c)
 
 void
 AssemblyFactory::destroy (const Cookie& c)
+  ACE_THROW_SPEC ((InvalidAssembly, RemoveFailure))
 {
   Assembly* asm = 0;
-  if (this->unbind (c, asm) != 0)
+  if (this->cookies_->unbind (c, asm) != 0)
     ACE_THROW (InvalidAssembly());
   delete asm;
 }
diff --git a/ACEXML/compass/AssemblyFactory.h b/ACEXML/compass/AssemblyFactory.h
index 955b2ac46c8..001e845b2dd 100644
--- a/ACEXML/compass/AssemblyFactory.h
+++ b/ACEXML/compass/AssemblyFactory.h
@@ -18,7 +18,7 @@
 
 namespace Deployment
 {
-
+  class Assembly;
   typedef ACE_Hash_Map_Entry<ACEXML_String,
                              Assembly*> COOKIE;
 
@@ -43,6 +43,7 @@ namespace Deployment
   class Compass_Export AssemblyFactory
   {
   public:
+
     friend class ACE_Singleton<AssemblyFactory, ACE_SYNCH_MUTEX>;
 
     Cookie create(const Location& assembly_loc)
@@ -53,13 +54,17 @@ namespace Deployment
 
     void destroy(const Cookie& c)
       ACE_THROW_SPEC ((InvalidAssembly, RemoveFailure));
+
   protected:
     AssemblyFactory();
     ~AssemblyFactory();
     AssemblyFactory (const AssemblyFactory&);
     AssemblyFactory& operator= (const AssemblyFactory&);
+
   private:
+
     COOKIES_MANAGER cookies_;
+
   };
   typedef ACE_Singleton<AssemblyFactory, ACE_SYNCH_MUTEX> ASSEMBLY_FACTORY;
 }
diff --git a/ACEXML/compass/Compass.dsp b/ACEXML/compass/Compass.dsp
new file mode 100644
index 00000000000..e42e752d3ad
--- /dev/null
+++ b/ACEXML/compass/Compass.dsp
@@ -0,0 +1,183 @@
+# Microsoft Developer Studio Project File - Name="Compass DLL" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=Compass DLL - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE run the tool that generated this project file and specify the

+!MESSAGE nmake output type.  You can then use the following command:

+!MESSAGE

+!MESSAGE NMAKE /f "Compass.mak".

+!MESSAGE

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE

+!MESSAGE NMAKE /f "Compass.mak" CFG="Compass DLL - Win32 Debug"

+!MESSAGE

+!MESSAGE Possible choices for configuration are:

+!MESSAGE

+!MESSAGE "Compass DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "Compass DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Compass DLL - Win32 Release"

+

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "."

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD CPP /nologo /W3 /GX /O2 /MD /Zi /Ob2 /GR /I "..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D COMPASS_BUILD=1 /FD /c

+# SUBTRACT CPP /YX

+# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\.."

+BSC32=bscmake.exe

+# ADD BSC32 /nologo /o".\Compass.bsc"

+LINK32=link.exe

+# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO ACEXML.lib ACEXML_Parser.lib zzip.lib z.lib ACE.lib /libpath:"..\..\ace" /nologo /version:5.2.4 /subsystem:windows /dll  /machine:I386 /out:"..\..\bin\Compass.dll"

+

+!ELSEIF  "$(CFG)" == "Compass DLL - Win32 Debug"

+

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "."

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D COMPASS_BUILD=1 /FD /c

+# SUBTRACT CPP /Fr /YX

+# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\.."

+BSC32=bscmake.exe

+# ADD BSC32 /nologo /o".\Compass.bsc"

+LINK32=link.exe

+# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO ACEXMLd.lib ACEXML_Parserd.lib zzipd.lib zd.lib ACEd.lib /libpath:"..\..\ace" /nologo /version:5.2.4 /subsystem:windows /dll /debug /pdb:Compassd.pdb /machine:I386 /out:"..\..\bin\Compassd.dll"

+

+!ENDIF

+

+# Begin Target

+

+# Name "Compass DLL - Win32 Release"

+# Name "Compass DLL - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;cxx;c"

+# Begin Source File

+

+SOURCE=.\Assembly.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\AssemblyFactory.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ComponentServer.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ConfigValue.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropertyFile_Handler.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ServerActivator.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hh"

+# Begin Source File

+

+SOURCE=.\Assembly.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\AssemblyFactory.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\CCMHome.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Compass_Export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\CompassTypes.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ComponentInstallation.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ComponentServer.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ConfigValue.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Container.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Deployment.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropertyFile_Handler.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ServerActivator.h

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter "i;inl"

+# Begin Source File

+

+SOURCE=.\Assembly.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\CCMHome.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\ComponentInstallation.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\ComponentServer.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Container.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropertyFile_Handler.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\ServerActivator.inl

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/ACEXML/compass/Compass_Static.dsp b/ACEXML/compass/Compass_Static.dsp
new file mode 100644
index 00000000000..f5e94a23c01
--- /dev/null
+++ b/ACEXML/compass/Compass_Static.dsp
@@ -0,0 +1,183 @@
+# Microsoft Developer Studio Project File - Name="Compass LIB" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

+

+CFG=Compass LIB - Win32 Static Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE run the tool that generated this project file and specify the

+!MESSAGE nmake output type.  You can then use the following command:

+!MESSAGE

+!MESSAGE NMAKE /f "Compass_Static.mak".

+!MESSAGE

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE

+!MESSAGE NMAKE /f "Compass_Static.mak" CFG="Compass LIB - Win32 Static Debug"

+!MESSAGE

+!MESSAGE Possible choices for configuration are:

+!MESSAGE

+!MESSAGE "Compass LIB - Win32 Static Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "Compass LIB - Win32 Static Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Compass LIB - Win32 Static Release"

+

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Static_Release"

+# PROP Intermediate_Dir "Static_Release"

+# PROP Target_Dir ""

+LINK32=link.exe -lib

+# ADD CPP /nologo /G5 /W3 /GX /O2 /MD /Zi /GR /I "..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D ACE_AS_STATIC_LIBS=1 /FD /c

+# SUBTRACT CPP /YX

+# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\.."

+BSC32=bscmake.exe

+# ADD BSC32 /nologo /o".\Compass.bsc"

+LIB32=link.exe -lib

+# ADD LIB32 /nologo /out:".\Compasss.lib"

+

+!ELSEIF  "$(CFG)" == "Compass LIB - Win32 Static Debug"

+

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Static_Debug"

+# PROP Intermediate_Dir "Static_Debug"

+# PROP Target_Dir ""

+LINK32=link.exe -lib

+# ADD CPP /nologo /G5 /W3 /Gm /GX /Zi /Od /GR /Gy /MDd /I "..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D ACE_AS_STATIC_LIBS=1 /FD /c

+# SUBTRACT CPP /Fr /YX

+# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\.."

+BSC32=bscmake.exe

+# ADD BSC32 /nologo /o".\Compass.bsc"

+LIB32=link.exe -lib

+# ADD LIB32 /nologo /out:".\Compasssd.lib"

+

+!ENDIF

+

+# Begin Target

+

+# Name "Compass LIB - Win32 Static Release"

+# Name "Compass LIB - Win32 Static Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;cxx;c"

+# Begin Source File

+

+SOURCE=.\Assembly.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\AssemblyFactory.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ComponentServer.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ConfigValue.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropertyFile_Handler.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ServerActivator.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hh"

+# Begin Source File

+

+SOURCE=.\Assembly.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\AssemblyFactory.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\CCMHome.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Compass_Export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\CompassTypes.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ComponentInstallation.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ComponentServer.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ConfigValue.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Container.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Deployment.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropertyFile_Handler.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ServerActivator.h

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter "i;inl"

+# Begin Source File

+

+SOURCE=.\Assembly.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\CCMHome.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\ComponentInstallation.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\ComponentServer.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Container.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropertyFile_Handler.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\ServerActivator.inl

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/ACEXML/compass/ComponentInstallation.cpp b/ACEXML/compass/ComponentInstallation.cpp
new file mode 100644
index 00000000000..4b169ef5e46
--- /dev/null
+++ b/ACEXML/compass/ComponentInstallation.cpp
@@ -0,0 +1,55 @@
+// $Id$
+
+#include "ACEXML/compass/ComponentInstallation.h"
+
+using namespace Deployment;
+
+static const empty_string[] = {0};
+
+ComponentInstallation::ComponentInstallation()
+  : packages_()
+{}
+
+ComponentInstallation::~ComponentInstallation()
+{}
+
+void
+ComponentInstallation::install (const UUID& implUUID,
+                                const Location& component_loc)
+  ACE_THROW_SPEC ((InvalidLocation,InstallationFailure))
+{
+  if (implUUID == empty_string)
+    ACE_THROW (InstallationFailure());
+  else if (component_loc == empty_string)
+    ACE_THROW (InvalidLocation());
+  else if (this->packages_->bind (implUUID, component_loc) != 0)
+    ACE_THROW (InstallationFailure());
+}
+
+void
+ComponentInstallation::replace (const UUID& implUUID,
+                                const Location& component_loc)
+  ACE_THROW_SPEC ((InvalidLocation,InstallationFailure))
+{
+  if (implUUID == empty_string)
+    ACE_THROW (InstallationFailure());
+  else if (component_loc == empty_string)
+    ACE_THROW (InvalidLocation());
+  else
+    {
+      if (this->packages_->unbind (implUUID) != 0)
+        ACE_THROW (InstallationFailure());
+      else if (this->packages_->bind (implUUID, component_loc) != 0)
+        ACE_THROW (InstallationFailure());
+    }
+}
+
+void
+ComponentInstallation::remove (const UUID& implUUID)
+  ACE_THROW_SPEC ((UnknownImplId, RemoveFailure));
+{
+  if (implUUID == empty_string)
+    ACE_THROW (UnknownImplId());
+  else if (this->packages_->unbind (implUUID) != 0)
+    ACE_THROW (RemoveFailure());
+}
diff --git a/ACEXML/compass/ComponentInstallation.h b/ACEXML/compass/ComponentInstallation.h
index 5521fc8f910..4dde93427ac 100644
--- a/ACEXML/compass/ComponentInstallation.h
+++ b/ACEXML/compass/ComponentInstallation.h
@@ -61,6 +61,7 @@ namespace Deployment
   private:
 
     Package_Manager packages_;
+
   };
   typedef ACE_Singleton<ComponentInstallation, ACE_SYNCH_MUTEX> COMP_INSTALL;
 
diff --git a/ACEXML/compass/ComponentServer.h b/ACEXML/compass/ComponentServer.h
index 8448e4254ed..f1ec06136fe 100644
--- a/ACEXML/compass/ComponentServer.h
+++ b/ACEXML/compass/ComponentServer.h
@@ -22,12 +22,12 @@ namespace Deployment
   class Compass_Export ComponentServer
   {
   public:
-    ComponentServer (const ConfigValues& config);
+    ComponentServer (ConfigValues* config);
     ~ComponentServer();
 
     ServerActivator* get_server_activator ();
 
-    Container* create_container (const ConfigValues& config)
+    Container* create_container (ConfigValues* config)
       ACE_THROW_SPEC ((CreateFailure, InvalidConfiguration));
 
     void remove_container (Container* cref)
@@ -40,7 +40,7 @@ namespace Deployment
 
     const ConfigValues& get_configuration (void);
 
-    void set_configuration (const ConfigValues& config);
+    void set_configuration (ConfigValues* config);
 
   private:
     Containers* containers_;
diff --git a/ACEXML/compass/Container.cpp b/ACEXML/compass/Container.cpp
new file mode 100644
index 00000000000..ab15c08d0a8
--- /dev/null
+++ b/ACEXML/compass/Container.cpp
@@ -0,0 +1,24 @@
+// $Id$
+
+#include "ACEXML/compass/Container.h"
+
+static ACE_TCHAR empty_string[] = { 0 };
+
+using namespace Deployment;
+
+Container::Container (ComponentServer* server)
+  : config_ (0), homes_ (0), parent_ (server)
+{}
+
+Container::~Container()
+{
+  this->remove();
+}
+
+CCMHome*
+Container::install_home (const UUID& id, const string& entrypt,
+                         const ConfigValues* config)
+  ACE_THROW_SPEC ((UnknownImplId, ImplEntryPointNotFound,
+                   InstallationFailure, InvalidConfiguration))
+{
+  if (COMP
diff --git a/ACEXML/compass/Container.h b/ACEXML/compass/Container.h
index 781cb444efc..c41239bc9df 100644
--- a/ACEXML/compass/Container.h
+++ b/ACEXML/compass/Container.h
@@ -18,7 +18,7 @@ namespace Deployment
   class Compass_Export Container
   {
   public:
-    Container(const ComponentServer* server);
+    Container(ComponentServer* server);
 
     ~Container();
 
diff --git a/ACEXML/compass/Makefile.Compass b/ACEXML/compass/Makefile.Compass
new file mode 100644
index 00000000000..f058439cb63
--- /dev/null
+++ b/ACEXML/compass/Makefile.Compass
@@ -0,0 +1,43 @@
+#----------------------------------------------------------------------------
+#       GNU Makefile
+#----------------------------------------------------------------------------
+MAKEFILE        = Makefile.Compass
+DEPENDENCY_FILE = .depend.Makefile.Compass
+LIB_UNCHECKED   = libCompass.a
+SHLIB_UNCHECKED = libCompass.$(SOEXT)
+
+
+
+FILES = \
+  Assembly \
+  PropertyFile_Handler \
+  AssemblyFactory \
+  ComponentServer \
+  ServerActivator \
+  ConfigValue
+
+LIB   = $(LIB_UNCHECKED)
+SHLIB = $(SHLIB_UNCHECKED)
+
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+LSRC   = $(addsuffix .cpp, $(FILES))
+ACELIB = -lACE
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+CPPFLAGS     += -I../..
+LDFLAGS      += -L../../ace
+
+ACE_SHLIBS = -lACEXML -lACEXML_Parser -lzzip -lz $(ACELIB)
+
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
+
diff --git a/ACEXML/compass/ServerActivator.cpp b/ACEXML/compass/ServerActivator.cpp
index 7155dfde574..3f0faf1ab2c 100644
--- a/ACEXML/compass/ServerActivator.cpp
+++ b/ACEXML/compass/ServerActivator.cpp
@@ -25,7 +25,7 @@ ServerActivator::~ServerActivator()
 }
 
 ComponentServer*
-ServerActivator::create_component_server (const ConfigValues& config)
+ServerActivator::create_component_server (ConfigValues* config)
   ACE_THROW_SPEC ((CreateFailure, InvalidConfiguration))
 {
   ComponentServer* cserver = 0;
diff --git a/ACEXML/compass/ServerActivator.h b/ACEXML/compass/ServerActivator.h
index ca6172e42b0..1f2a2a2c4b9 100644
--- a/ACEXML/compass/ServerActivator.h
+++ b/ACEXML/compass/ServerActivator.h
@@ -26,7 +26,8 @@ namespace Deployment
   {
   public:
     friend class ACE_Singleton <ServerActivator, ACE_SYNCH_MUTEX>;
-    ComponentServer* create_component_server (const ConfigValues& config)
+
+    ComponentServer* create_component_server (ConfigValues* config)
       ACE_THROW_SPEC ((CreateFailure, InvalidConfiguration));
 
     void remove_component_server (ComponentServer* server)
@@ -39,8 +40,10 @@ namespace Deployment
     ~ServerActivator();
     ServerActivator (const ServerActivator&);
     ServerActivator& operator= (const ServerActivator&);
+
   private:
     ComponentServers* comp_servers_;
+
   };
   typedef ACE_Singleton <ServerActivator, ACE_SYNCH_MUTEX> SERVER_ACTIVATOR;
 }
diff --git a/ACEXML/compass/compass.mpc b/ACEXML/compass/compass.mpc
new file mode 100644
index 00000000000..5ddc6a9baab
--- /dev/null
+++ b/ACEXML/compass/compass.mpc
@@ -0,0 +1,6 @@
+project (Compass) : acelib {
+   depends = ACEXML ACEXML_Parser
+   sharedname = Compass
+   dllflags   = COMPASS_BUILD
+   libs = ACEXML ACEXML_Parser zzip z
+}