diff options
39 files changed, 2222 insertions, 425 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw index 8f8b6dd564a..ac4d37aa350 100644 --- a/cpp/all.dsw +++ b/cpp/all.dsw @@ -545,6 +545,45 @@ Package=<4> Begin Project Dependency
Project_Dep_Name sessionS
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegrid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegridadmin
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegriddeployerC
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegriddeployerS
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegriddeployerSvc
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegridnode
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegridregistry
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegridsessionC
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegridsessionS
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegridsimpleC
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegridsimpleS
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegridupdateC
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegridupdateS
+ End Project Dependency
}}}
###############################################################################
@@ -1719,6 +1758,321 @@ Package=<4> ###############################################################################
+Project: "icegrid"=.\src\IceGrid\icegrid.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name glacier2
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "icegridadmin"=.\src\IceGrid\icegridadmin.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name icegrid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icexml
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "icegriddeployerC"=.\test\IceGrid\deployer\icegriddeployerC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegrid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "icegriddeployerS"=.\test\IceGrid\deployer\icegriddeployerS.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegrid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "icegriddeployerSvc"=.\test\IceGrid\deployer\icegriddeployerSvc.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegrid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icebox
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "icegridnode"=.\src\IceGrid\icegridnode.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icebox
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegrid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icestorm
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icestormS
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icexml
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icepatch2
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name glacier2
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name freeze
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "icegridregistry"=.\src\IceGrid\icegridregistry.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegrid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name glacier2
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icestorm
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name freeze
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icestormS
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icebox
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "icegridsessionC"=.\test\IceGrid\session\icegridsessionC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegrid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name glacier2
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "icegridsessionS"=.\test\IceGrid\session\icegridsessionS.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "icegridsimpleC"=.\test\IceGrid\simple\icegridsimpleC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegrid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "icegridsimpleS"=.\test\IceGrid\simple\icegridsimpleS.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegrid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "icegridupdateC"=.\test\IceGrid\update\icegridupdateC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegrid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name glacier2
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "icegridupdateS"=.\test\IceGrid\update\icegridupdateS.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "icepack"=.\src\icepack\icepack.dsp - Package Owner=<4>
Package=<5>
@@ -2483,6 +2837,18 @@ Package=<4> Begin Project Dependency
Project_Dep_Name slice2javae
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegrid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegridadmin
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegridnode
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icegridregistry
+ End Project Dependency
}}}
###############################################################################
diff --git a/cpp/allTests.py b/cpp/allTests.py index 7dd3182a169..5b00d376a6f 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -85,6 +85,10 @@ tests = [ \ "FreezeScript/evictor", \ "IcePack/simple", \ "IcePack/deployer", \ + "IceGrid/simple", \ + "IceGrid/deployer", \ + "IceGrid/session", \ + "IceGrid/update", \ "Glacier2/router", \ ] diff --git a/cpp/include/IceStorm/Service.h b/cpp/include/IceStorm/Service.h new file mode 100644 index 00000000000..9ac17a92a75 --- /dev/null +++ b/cpp/include/IceStorm/Service.h @@ -0,0 +1,50 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICESTORM_SERVICE_H +#define ICESTORM_SERVICE_H + +#include <IceBox/IceBox.h> +#include <IceStorm/IceStorm.h> + +#ifndef ICE_STORM_SERVICE_API +# ifdef ICE_STORM_SERVICE_API_EXPORTS +# define ICE_STORM_SERVICE_API ICE_DECLSPEC_EXPORT +# else +# define ICE_STORM_SERVICE_API ICE_DECLSPEC_IMPORT +# endif +#endif + +namespace IceStorm +{ + +class Service; +typedef ::IceInternal::Handle< ::IceStorm::Service> ServicePtr; + +class ICE_STORM_SERVICE_API Service : public ::IceBox::Service +{ +public: + + static ServicePtr create(const Ice::CommunicatorPtr&, + const Ice::ObjectAdapterPtr&, + const Ice::ObjectAdapterPtr&, + const std::string&, + const Ice::Identity&, + const std::string&); + + virtual void start(const std::string&, const Ice::CommunicatorPtr&, const Ice::StringSeq&) = 0; + + virtual TopicManagerPrx getTopicManager() const = 0; + + virtual void stop() = 0; +}; + +}; + +#endif diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index 30b727a1837..bcb96168b7d 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -18,7 +18,6 @@ #include <signal.h> #include <fcntl.h> - using namespace std; using namespace Ice; using namespace IceGrid; diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h index 7d568974010..5c6ecb81afd 100644 --- a/cpp/src/IceGrid/AdapterCache.h +++ b/cpp/src/IceGrid/AdapterCache.h @@ -13,6 +13,7 @@ #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> #include <IceGrid/Cache.h> +#include <IceGrid/Internal.h> namespace IceGrid { diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index f7ea98f5fed..41cdb6645ab 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -59,10 +59,10 @@ public: { throw ServerNotExistException(_id); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException& e) { ostringstream os; - os << ex; + os << e; NodeUnreachableException ex; ex.name = _node; @@ -248,7 +248,7 @@ AdminI::sendSignal(const string& id, const string& signal, const Current&) ServerProxyWrapper proxy(_database, id); try { - return proxy->sendSignal(signal); + proxy->sendSignal(signal); } catch(const Ice::Exception& ex) { @@ -354,11 +354,11 @@ AdminI::addObject(const Ice::ObjectPrx& proxy, const ::Ice::Current& current) { addObjectWithType(proxy, proxy->ice_id(), current); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException& e) { ostringstream os; os << "failed to invoke ice_id() on proxy `" + _communicator->proxyToString(proxy) + "':\n"; - os << ex; + os << e; DeploymentException ex; ex.reason = os.str(); diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index d5af71be0db..d44e9ba63ff 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -150,6 +150,7 @@ Database::Database(const Ice::ObjectAdapterPtr& adapter, _descriptors(_connection, _descriptorDbName), _objects(_connection, _objectDbName), _adapters(_connection, _adapterDbName), + _lock(0), _serial(0) { // @@ -994,12 +995,13 @@ Database::reload(const ApplicationHelper& oldApp, const ApplicationHelper& newAp // Unload/load replicated adapters. // const ReplicatedAdapterDescriptorSeq& oldAdpts = oldApp.getDescriptor().replicatedAdapters; - for(ReplicatedAdapterDescriptorSeq::const_iterator r = oldAdpts.begin(); r != oldAdpts.end(); ++r) + ReplicatedAdapterDescriptorSeq::const_iterator r; + for(r = oldAdpts.begin(); r != oldAdpts.end(); ++r) { _adapterCache.get(r->id, false)->disableReplication(); } const ReplicatedAdapterDescriptorSeq& newAdpts = newApp.getDescriptor().replicatedAdapters; - for(ReplicatedAdapterDescriptorSeq::const_iterator r = newAdpts.begin(); r != newAdpts.end(); ++r) + for(r = newAdpts.begin(); r != newAdpts.end(); ++r) { _adapterCache.get(r->id, true)->enableReplication(r->loadBalancing); } @@ -1012,7 +1014,8 @@ Database::reload(const ApplicationHelper& oldApp, const ApplicationHelper& newAp // updated servers to reload them after. // vector<ServerInfo> load; - for(map<string, ServerInfo>::const_iterator p = newServers.begin(); p != newServers.end(); ++p) + map<string, ServerInfo>::const_iterator p; + for(p = newServers.begin(); p != newServers.end(); ++p) { map<string, ServerInfo>::const_iterator q = oldServers.find(p->first); if(q == oldServers.end()) @@ -1026,7 +1029,7 @@ Database::reload(const ApplicationHelper& oldApp, const ApplicationHelper& newAp load.push_back(p->second); } } - for(map<string, ServerInfo>::const_iterator p = oldServers.begin(); p != oldServers.end(); ++p) + for(p = oldServers.begin(); p != oldServers.end(); ++p) { map<string, ServerInfo>::const_iterator q = newServers.find(p->first); if(q == newServers.end()) @@ -1038,8 +1041,8 @@ Database::reload(const ApplicationHelper& oldApp, const ApplicationHelper& newAp // // Load added servers and reload updated ones. // - for(vector<ServerInfo>::const_iterator p = load.begin(); p != load.end(); ++p) + for(vector<ServerInfo>::const_iterator q = load.begin(); q != load.end(); ++q) { - entries.push_back(_serverCache.add(*p)); + entries.push_back(_serverCache.add(*q)); } } diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 980339b0612..5ce2dbdf2f3 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -10,8 +10,6 @@ #include <Ice/Ice.h> #include <IceGrid/DescriptorHelper.h> #include <IceGrid/Util.h> -#include <IceGrid/AdapterCache.h> -#include <IceGrid/ServerCache.h> #include <iterator> @@ -72,7 +70,11 @@ struct TemplateDescriptorEqual : std::binary_function<TemplateDescriptor&, Templ template <typename GetKeyFunc, typename Seq> Seq getSeqUpdatedElts(const Seq& lseq, const Seq& rseq, GetKeyFunc func) { - return getSeqUpdatedElts(lseq, rseq, func, equal_to<typename Seq::value_type>()); +#if defined(_MSC_VER) && (_MSC_VER < 1300) + return getSeqUpdatedElts(lseq, rseq, func, equal_to<Seq::value_type>()); +#else + return getSeqUpdatedElts(lseq, rseq, func, equal_to<typename Seq::value_type>()); +#endif } template <typename GetKeyFunc, typename EqFunc, typename Seq> Seq @@ -148,7 +150,11 @@ updateSeqElts(const Seq& seq, const Seq& update, const Ice::StringSeq& remove, G template<typename Dict> Dict getDictUpdatedElts(const Dict& ldict, const Dict& rdict) { +#if defined(_MSC_VER) && (_MSC_VER < 1300) + return getDictUpdatedElts(ldict, rdict, equal_to<Dict::mapped_type>()); +#else return getDictUpdatedElts(ldict, rdict, equal_to<typename Dict::mapped_type>()); +#endif } template<typename Dict, typename EqFunc> Dict @@ -517,19 +523,19 @@ CommunicatorHelper::instantiateImpl(const CommunicatorDescriptorPtr& instance, c } instance->adapters.push_back(adapter); } - for(PropertyDescriptorSeq::const_iterator p = _desc->properties.begin(); p != _desc->properties.end(); ++p) + for(PropertyDescriptorSeq::const_iterator r = _desc->properties.begin(); r != _desc->properties.end(); ++r) { PropertyDescriptor prop; - prop.name = resolve(p->name, "property name"); - prop.value = resolve(p->value, "property value"); + prop.name = resolve(r->name, "property name"); + prop.value = resolve(r->value, "property value"); instance->properties.push_back(prop); } - for(DbEnvDescriptorSeq::const_iterator p = _desc->dbEnvs.begin(); p != _desc->dbEnvs.end(); ++p) + for(DbEnvDescriptorSeq::const_iterator s = _desc->dbEnvs.begin(); s != _desc->dbEnvs.end(); ++s) { DbEnvDescriptor dbEnv; - dbEnv.name = resolve(p->name, "database environment name", false); - dbEnv.dbHome = resolve(p->dbHome, "database environment home directory"); - for(PropertyDescriptorSeq::const_iterator q = p->properties.begin(); q != p->properties.end(); ++q) + dbEnv.name = resolve(s->name, "database environment name", false); + dbEnv.dbHome = resolve(s->dbHome, "database environment home directory"); + for(PropertyDescriptorSeq::const_iterator q = s->properties.begin(); q != s->properties.end(); ++q) { PropertyDescriptor prop; prop.name = resolve(q->name, "database environment property name", false); @@ -806,24 +812,24 @@ ServerHelper::instantiateImpl(const ServerDescriptorPtr& instance, const Resolve { instance->options.push_back(resolve(*p, "option")); } - for(Ice::StringSeq::const_iterator p = _desc->envs.begin(); p != _desc->envs.end(); ++p) + for(Ice::StringSeq::const_iterator r = _desc->envs.begin(); r != _desc->envs.end(); ++r) { - instance->envs.push_back(resolve(*p, "environment variable")); + instance->envs.push_back(resolve(*r, "environment variable")); } - for(PatchDescriptorSeq::const_iterator p = _desc->patchs.begin(); p != _desc->patchs.end(); ++p) + for(PatchDescriptorSeq::const_iterator s = _desc->patchs.begin(); s != _desc->patchs.end(); ++s) { PatchDescriptor patch; - patch.destination = resolve(p->destination, "patch destination directory", true); - patch.proxy = resolve(p->proxy, "patch server proxy"); - for(Ice::StringSeq::const_iterator q = p->sources.begin(); q != p->sources.end(); ++q) + patch.destination = resolve(s->destination, "patch destination directory", true); + patch.proxy = resolve(s->proxy, "patch server proxy"); + for(Ice::StringSeq::const_iterator q = s->sources.begin(); q != s->sources.end(); ++q) { patch.sources.push_back(resolve(*q, "patch source directory")); } instance->patchs.push_back(patch); } - for(Ice::StringSeq::const_iterator p = _desc->usePatchs.begin(); p != _desc->usePatchs.end(); ++p) + for(Ice::StringSeq::const_iterator t = _desc->usePatchs.begin(); t != _desc->usePatchs.end(); ++t) { - PatchDescriptor patch = resolve.getPatchDescriptor(*p); + PatchDescriptor patch = resolve.getPatchDescriptor(*t); patch.destination = resolve(patch.destination, "patch destination directory", true, false); patch.proxy = resolve(patch.proxy, "patch server proxy", false, false); for(Ice::StringSeq::iterator q = patch.sources.begin(); q != patch.sources.end(); ++q) @@ -1427,9 +1433,9 @@ NodeHelper::diff(const NodeHelper& helper) const update.removeServers = getDictRemovedElts(helper._serverInstances, _serverInstances); updated = getDictUpdatedElts(helper._servers, _servers); - for(ServerInstanceHelperDict::const_iterator p = updated.begin(); p != updated.end(); ++p) + for(ServerInstanceHelperDict::const_iterator q = updated.begin(); q != updated.end(); ++q) { - update.servers.push_back(p->second.getDefinition()); + update.servers.push_back(q->second.getDefinition()); } Ice::StringSeq removed = getDictRemovedElts(helper._servers, _servers); update.removeServers.insert(update.removeServers.end(), removed.begin(), removed.end()); @@ -1449,10 +1455,10 @@ NodeHelper::update(const NodeUpdateDescriptor& update, const Resolver& appResolv // // Remove the servers and server instances. // - for(Ice::StringSeq::const_iterator r = update.removeServers.begin(); r != update.removeServers.end(); ++r) + for(Ice::StringSeq::const_iterator t = update.removeServers.begin(); t != update.removeServers.end(); ++t) { - _serverInstances.erase(*r); - _servers.erase(*r); + _serverInstances.erase(*t); + _servers.erase(*t); } for(map<string, string>::const_iterator p = update.variables.begin(); p != update.variables.end(); ++p) @@ -1476,6 +1482,7 @@ NodeHelper::update(const NodeUpdateDescriptor& update, const Resolver& appResolv // isn't changing the id: this is not allowed, instead the old // server should be removed first. // + ServerInstanceHelperDict::const_iterator r; ServerInstanceHelperDict serverInstances; serverInstances.swap(_serverInstances); for(ServerInstanceDescriptorSeq::const_iterator q = update.serverInstances.begin(); @@ -1488,13 +1495,13 @@ NodeHelper::update(const NodeUpdateDescriptor& update, const Resolver& appResolv } serverInstances.erase(helper.getId()); } - for(ServerInstanceHelperDict::const_iterator q = serverInstances.begin(); q != serverInstances.end(); ++q) + for(r = serverInstances.begin(); r != serverInstances.end(); ++r) { - ServerInstanceHelper helper(q->second.getDescriptor(), resolve); // Re-instantiate the server. - if(helper.getId() != q->first) + ServerInstanceHelper helper(r->second.getDescriptor(), resolve); // Re-instantiate the server. + if(helper.getId() != r->first) { resolve.exception("invalid update in node `" + _name + "':\n" + - "server instance id `" + q->first + "' changed to `" + helper.getId() + "'"); + "server instance id `" + r->first + "' changed to `" + helper.getId() + "'"); } if(!_serverInstances.insert(make_pair(helper.getId(), helper)).second) { @@ -1520,13 +1527,13 @@ NodeHelper::update(const NodeUpdateDescriptor& update, const Resolver& appResolv } servers.erase(helper.getId()); } - for(ServerInstanceHelperDict::const_iterator q = servers.begin(); q != servers.end(); ++q) + for(r = servers.begin(); r != servers.end(); ++r) { - ServerInstanceHelper helper(q->second.getDefinition(), resolve); // Re-instantiate the server. - if(helper.getId() != q->first) + ServerInstanceHelper helper(r->second.getDefinition(), resolve); // Re-instantiate the server. + if(helper.getId() != r->first) { resolve.exception("invalid update in node `" + _name + "':\n" + - "server instance id `" + q->first + "' changed to `" + helper.getId() + "'"); + "server instance id `" + r->first + "' changed to `" + helper.getId() + "'"); } if(!_servers.insert(make_pair(helper.getId(), helper)).second) { @@ -1538,30 +1545,31 @@ NodeHelper::update(const NodeUpdateDescriptor& update, const Resolver& appResolv // Update the node descriptor with the new server instances and servers. // _desc.serverInstances.clear(); - for(ServerInstanceHelperDict::const_iterator t = _serverInstances.begin(); t != _serverInstances.end(); ++t) + for(r = _serverInstances.begin(); r != _serverInstances.end(); ++r) { - _desc.serverInstances.push_back(t->second.getDescriptor()); + _desc.serverInstances.push_back(r->second.getDescriptor()); } _desc.servers.clear(); - for(ServerInstanceHelperDict::const_iterator u = _servers.begin(); u != _servers.end(); ++u) + for(r = _servers.begin(); r != _servers.end(); ++r) { - _desc.servers.push_back(u->second.getDefinition()); + _desc.servers.push_back(r->second.getDefinition()); } } void NodeHelper::getIds(multiset<string>& serverIds, multiset<string>& adapterIds, multiset<Ice::Identity>& objectIds) const { - for(ServerInstanceHelperDict::const_iterator p = _serverInstances.begin(); p != _serverInstances.end(); ++p) + ServerInstanceHelperDict::const_iterator p; + for(p = _serverInstances.begin(); p != _serverInstances.end(); ++p) { serverIds.insert(p->first); p->second.getIds(adapterIds, objectIds); } - for(ServerInstanceHelperDict::const_iterator q = _servers.begin(); q != _servers.end(); ++q) + for(p = _servers.begin(); p != _servers.end(); ++p) { - serverIds.insert(q->first); - q->second.getIds(adapterIds, objectIds); + serverIds.insert(p->first); + p->second.getIds(adapterIds, objectIds); } } @@ -1574,7 +1582,8 @@ NodeHelper::getDescriptor() const void NodeHelper::getServerInfos(const string& application, map<string, ServerInfo>& servers) const { - for(ServerInstanceHelperDict::const_iterator p = _serverInstances.begin(); p != _serverInstances.end(); ++p) + ServerInstanceHelperDict::const_iterator p; + for(p = _serverInstances.begin(); p != _serverInstances.end(); ++p) { ServerInfo info; info.node = _name; @@ -1582,7 +1591,7 @@ NodeHelper::getServerInfos(const string& application, map<string, ServerInfo>& s info.descriptor = p->second.getInstance(); servers.insert(make_pair(p->second.getId(), info)); } - for(ServerInstanceHelperDict::const_iterator p = _servers.begin(); p != _servers.end(); ++p) + for(p = _servers.begin(); p != _servers.end(); ++p) { ServerInfo info; info.node = _name; @@ -1598,14 +1607,15 @@ NodeHelper::getPatchDirs(const string& patch, const Resolver& appResolve) const Ice::StringSeq servers; set<string> directories; Resolver resolve(appResolve, _desc.variables, false); - for(ServerInstanceHelperDict::const_iterator p = _serverInstances.begin(); p != _serverInstances.end(); ++p) + ServerInstanceHelperDict::const_iterator p; + for(p = _serverInstances.begin(); p != _serverInstances.end(); ++p) { if(p->second.getPatchDirs(patch, resolve, directories)) { servers.push_back(p->second.getId()); } } - for(ServerInstanceHelperDict::const_iterator p = _servers.begin(); p != _servers.end(); ++p) + for(p = _servers.begin(); p != _servers.end(); ++p) { if(p->second.getPatchDirs(patch, resolve, directories)) { @@ -1638,11 +1648,12 @@ NodeHelper::print(Output& out) const out << nl << "servers"; out << sb; - for(ServerInstanceHelperDict::const_iterator p = _serverInstances.begin(); p != _serverInstances.end(); ++p) + ServerInstanceHelperDict::const_iterator p; + for(p = _serverInstances.begin(); p != _serverInstances.end(); ++p) { out << nl << p->first; } - for(ServerInstanceHelperDict::const_iterator p = _servers.begin(); p != _servers.end(); ++p) + for(p = _servers.begin(); p != _servers.end(); ++p) { out << nl << p->first; } @@ -1679,7 +1690,8 @@ NodeHelper::printDiff(Output& out, const NodeHelper& helper) const out << nl << "servers"; out << sb; - for(ServerInstanceHelperDict::const_iterator p = updated.begin(); p != updated.end(); ++p) + ServerInstanceHelperDict::const_iterator p; + for(p = updated.begin(); p != updated.end(); ++p) { if(helper._serverInstances.find(p->first) == helper._serverInstances.end() && helper._servers.find(p->first) == helper._servers.end()) @@ -1687,7 +1699,7 @@ NodeHelper::printDiff(Output& out, const NodeHelper& helper) const out << nl << "server `" << p->first << "' added"; } } - for(ServerInstanceHelperDict::const_iterator p = updated.begin(); p != updated.end(); ++p) + for(p = updated.begin(); p != updated.end(); ++p) { if(helper._serverInstances.find(p->first) != helper._serverInstances.end() || helper._servers.find(p->first) != helper._servers.end()) @@ -1695,9 +1707,9 @@ NodeHelper::printDiff(Output& out, const NodeHelper& helper) const out << nl << "server `" << p->first << "' updated"; } } - for(Ice::StringSeq::const_iterator p = removed.begin(); p != removed.end(); ++p) + for(Ice::StringSeq::const_iterator q = removed.begin(); q != removed.end(); ++q) { - out << nl << "server `" << *p << "' removed"; + out << nl << "server `" << *q << "' removed"; } out << eb; @@ -1811,9 +1823,9 @@ ApplicationHelper::update(const ApplicationUpdateDescriptor& update) update.removeServiceTemplates); - for(Ice::StringSeq::const_iterator p = update.removeNodes.begin(); p != update.removeNodes.end(); ++p) + for(Ice::StringSeq::const_iterator r = update.removeNodes.begin(); r != update.removeNodes.end(); ++r) { - _nodes.erase(*p); + _nodes.erase(*r); } // @@ -1847,10 +1859,10 @@ ApplicationHelper::update(const ApplicationUpdateDescriptor& update) nodes.erase(q); } } - for(NodeHelperDict::const_iterator p = nodes.begin(); p != nodes.end(); ++p) + for(NodeHelperDict::const_iterator n = nodes.begin(); n != nodes.end(); ++n) { - NodeHelper helper(p->first, p->second.getDescriptor(), resolve); // Re-instantiate the node. - _nodes.insert(make_pair(p->first, helper)); + NodeHelper helper(n->first, n->second.getDescriptor(), resolve); // Re-instantiate the node. + _nodes.insert(make_pair(n->first, helper)); } // @@ -1879,9 +1891,8 @@ ApplicationHelper::getIds(set<string>& serverIds, set<string>& adapterIds, set<I { p->second.getIds(sIds, aIds, oIds); } - - for(ReplicatedAdapterDescriptorSeq::const_iterator r = _desc.replicatedAdapters.begin(); - r != _desc.replicatedAdapters.end(); ++r) + ReplicatedAdapterDescriptorSeq::const_iterator r; + for(r = _desc.replicatedAdapters.begin(); r != _desc.replicatedAdapters.end(); ++r) { aIds.insert(r->id); for(ObjectDescriptorSeq::const_iterator o = r->objects.begin(); o != r->objects.end(); ++o) @@ -1991,8 +2002,8 @@ ApplicationHelper::print(Output& out) const { out << nl << "replicated adapters"; out << sb; - for(ReplicatedAdapterDescriptorSeq::const_iterator p = _desc.replicatedAdapters.begin(); - p != _desc.replicatedAdapters.end(); ++p) + ReplicatedAdapterDescriptorSeq::const_iterator p; + for(p = _desc.replicatedAdapters.begin(); p != _desc.replicatedAdapters.end(); ++p) { out << nl << "id = `" << p->id << "' load balancing = '"; if(RandomLoadBalancingPolicyPtr::dynamicCast(p->loadBalancing)) @@ -2015,8 +2026,8 @@ ApplicationHelper::print(Output& out) const { out << nl << "server templates"; out << sb; - for(TemplateDescriptorDict::const_iterator p = _desc.serverTemplates.begin(); - p != _desc.serverTemplates.end(); ++p) + TemplateDescriptorDict::const_iterator p; + for(p = _desc.serverTemplates.begin(); p != _desc.serverTemplates.end(); ++p) { out << nl << p->first; } @@ -2026,8 +2037,8 @@ ApplicationHelper::print(Output& out) const { out << nl << "service templates"; out << sb; - for(TemplateDescriptorDict::const_iterator p = _desc.serviceTemplates.begin(); - p != _desc.serviceTemplates.end(); ++p) + TemplateDescriptorDict::const_iterator p; + for(p = _desc.serviceTemplates.begin(); p != _desc.serviceTemplates.end(); ++p) { out << nl << p->first; } @@ -2068,16 +2079,16 @@ ApplicationHelper::printDiff(Output& out, const ApplicationHelper& helper) const out << nl << "server template `" << p->first << "' added"; } } - for(TemplateDescriptorDict::const_iterator p = updated.begin(); p != updated.end(); ++p) + for(TemplateDescriptorDict::const_iterator q = updated.begin(); q != updated.end(); ++q) { - if(helper._desc.serverTemplates.find(p->first) != helper._desc.serverTemplates.end()) + if(helper._desc.serverTemplates.find(q->first) != helper._desc.serverTemplates.end()) { - out << nl << "server template `" << p->first << "' updated"; + out << nl << "server template `" << q->first << "' updated"; } } - for(Ice::StringSeq::const_iterator p = removed.begin(); p != removed.end(); ++p) + for(Ice::StringSeq::const_iterator r = removed.begin(); r != removed.end(); ++r) { - out << nl << "server template `" << *p << "' removed"; + out << nl << "server template `" << *r << "' removed"; } out << eb; } @@ -2097,16 +2108,16 @@ ApplicationHelper::printDiff(Output& out, const ApplicationHelper& helper) const out << nl << "service template `" << p->first << "' added"; } } - for(TemplateDescriptorDict::const_iterator p = updted.begin(); p != updted.end(); ++p) + for(TemplateDescriptorDict::const_iterator q = updted.begin(); q != updted.end(); ++q) { - if(helper._desc.serviceTemplates.find(p->first) != helper._desc.serviceTemplates.end()) + if(helper._desc.serviceTemplates.find(q->first) != helper._desc.serviceTemplates.end()) { - out << nl << "service template `" << p->first << "' updated"; + out << nl << "service template `" << q->first << "' updated"; } } - for(Ice::StringSeq::const_iterator p = removed.begin(); p != removed.end(); ++p) + for(Ice::StringSeq::const_iterator r = removed.begin(); r != removed.end(); ++r) { - out << nl << "service template `" << *p << "' removed"; + out << nl << "service template `" << *r << "' removed"; } out << eb; } @@ -2126,17 +2137,17 @@ ApplicationHelper::printDiff(Output& out, const ApplicationHelper& helper) const p->second.print(out); } } - for(NodeHelperDict::const_iterator p = updated.begin(); p != updated.end(); ++p) + for(NodeHelperDict::const_iterator r = updated.begin(); r != updated.end(); ++r) { - NodeHelperDict::const_iterator q = helper._nodes.find(p->first); + NodeHelperDict::const_iterator q = helper._nodes.find(r->first); if(q != helper._nodes.end()) { p->second.printDiff(out, q->second); } } - for(Ice::StringSeq::const_iterator p = removed.begin(); p != removed.end(); ++p) + for(Ice::StringSeq::const_iterator s = removed.begin(); s != removed.end(); ++s) { - out << nl << "node `" << *p << "' removed"; + out << nl << "node `" << *s << "' removed"; } out << eb; } @@ -2171,9 +2182,9 @@ ApplicationHelper::validate(const Resolver& resolve) const } } - for(PatchDescriptorDict::const_iterator p = _desc.patchs.begin(); p != _desc.patchs.end(); ++p) + for(PatchDescriptorDict::const_iterator q = _desc.patchs.begin(); q != _desc.patchs.end(); ++q) { - if(p->first == "") + if(q->first == "") { resolve.exception("empty patch id"); } @@ -2201,31 +2212,31 @@ ApplicationHelper::validate(const Resolver& resolve) const } } - for(NodeHelperDict::const_iterator p = _nodes.begin(); p != _nodes.end(); ++p) + for(NodeHelperDict::const_iterator n = _nodes.begin(); n != _nodes.end(); ++n) { - p->second.validate(resolve); - p->second.getIds(serverIds, adapterIds, objectIds); + n->second.validate(resolve); + n->second.getIds(serverIds, adapterIds, objectIds); } - for(multiset<string>::const_iterator p = serverIds.begin(); p != serverIds.end(); ++p) + for(multiset<string>::const_iterator s = serverIds.begin(); s != serverIds.end(); ++s) { - if(serverIds.count(*p) > 1) + if(serverIds.count(*s) > 1) { - resolve.exception("duplicate server `" + *p + "'"); + resolve.exception("duplicate server `" + *s + "'"); } } - for(multiset<string>::const_iterator p = adapterIds.begin(); p != adapterIds.end(); ++p) + for(multiset<string>::const_iterator a = adapterIds.begin(); a != adapterIds.end(); ++a) { - if(adapterIds.count(*p) > 1 && replicatedAdapterIds.find(*p) == replicatedAdapterIds.end()) + if(adapterIds.count(*a) > 1 && replicatedAdapterIds.find(*a) == replicatedAdapterIds.end()) { - resolve.exception("duplicate adapter `" + *p + "'"); + resolve.exception("duplicate adapter `" + *a + "'"); } } - for(multiset<Ice::Identity>::const_iterator p = objectIds.begin(); p != objectIds.end(); ++p) + for(multiset<Ice::Identity>::const_iterator o = objectIds.begin(); o != objectIds.end(); ++o) { - if(objectIds.count(*p) > 1) + if(objectIds.count(*o) > 1) { - resolve.exception("duplicate object `" + Ice::identityToString(*p) + "'"); + resolve.exception("duplicate object `" + Ice::identityToString(*o) + "'"); } } } diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 6042aec32d3..63d85a1c7fe 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -9,6 +9,7 @@ #include <IceUtil/UUID.h> #include <Ice/Ice.h> +#include <Ice/ProtocolPluginFacade.h> // Just to get the hostname #include <Ice/Locator.h> #include <Ice/Service.h> #include <IceGrid/Activator.h> @@ -414,17 +415,12 @@ NodeService::start(int argc, char* argv[]) string name = properties->getProperty("IceGrid.Node.Name"); if(name.empty()) { - char host[1024 + 1]; - if(gethostname(host, 1024) != 0) + string hostname = IceInternal::getProtocolPluginFacade(communicator())->getDefaultHost(); + if(!nowarn) { - syserror("property `IceGrid.Node.Name' is not set and couldn't get the hostname:"); - return false; - } - else if(!nowarn) - { - warning("property `IceGrid.Node.Name' is not set, using hostname: " + string(host)); + warning("property `IceGrid.Node.Name' is not set, using hostname: " + hostname); } - properties->setProperty("IceGrid.Node.Name", string(host)); + properties->setProperty("IceGrid.Node.Name", hostname); } // @@ -478,7 +474,7 @@ NodeService::start(int argc, char* argv[]) catch(const Ice::ServerNotFoundException&) { } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { } } diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index 0ad216256a9..fdb1af0d0e1 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -175,23 +175,7 @@ $(LOCAL_HDIR)/StringObjectProxiesDict.h StringObjectProxiesDict.cpp: $(SLICE2FRE StringObjectProxiesDict $(LOCAL_SDIR)/Internal.ice clean:: - rm -f StringObjectProxyDict.h StringObjectProxyDict.cpp - -$(LOCAL_HDIR)/StringStringSeqDict.h StringStringSeqDict.cpp: $(SLICE2FREEZE) - rm -f StringStringSeqDict.h StringStringSeqDict.cpp - $(SLICE2FREEZECMD) --dict IceGrid::StringStringSeqDict,string,Ice::StringSeq \ - StringStringSeqDict ../../slice/Ice/BuiltinSequences.ice - -clean:: - rm -f StringStringSeqDict.h StringStringSeqDict.cpp - -$(LOCAL_HDIR)/StringServerDescriptorDict.h StringServerDescriptorDict.cpp: $(SLICE2FREEZE) - rm -f StringServerDescriptorDict.h StringServerDescriptorDict.cpp - $(SLICE2FREEZECMD) --dict IceGrid::StringServerDescriptorDict,string,IceGrid::ServerDescriptor \ - StringServerDescriptorDict ../../slice/IceGrid/Admin.ice - -clean:: - rm -f StringServerDescriptorDict.h StringServerDescriptorDict.cpp + rm -f StringObjectProxiesDict.h StringObjectProxiesDict.cpp $(LOCAL_HDIR)/StringApplicationDescriptorDict.h StringApplicationDescriptorDict.cpp: $(SLICE2FREEZE) rm -f StringApplicationDescriptorDict.h StringApplicationDescriptorDict.cpp @@ -210,14 +194,6 @@ $(LOCAL_HDIR)/IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZ clean:: rm -f IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp -$(LOCAL_HDIR)/StringObjectProxySeqDict.h StringObjectProxySeqDict.cpp: $(SLICE2FREEZE) - rm -f StringObjectProxySeqDict.h StringObjectProxySeqDict.cpp - $(SLICE2FREEZECMD) --dict IceGrid::StringObjectProxySeqDict,string,Ice::ObjectProxySeq \ - StringObjectProxySeqDict $(slicedir)/Ice/BuiltinSequences.ice - -clean:: - rm -f StringObjectProxySeqDict.h StringObjectProxySeqDict.cpp - # Needed for make -jn to work. #../IceGrid/Grammar.y: Grammar.h diff --git a/cpp/src/IceGrid/NodeCache.h b/cpp/src/IceGrid/NodeCache.h index 73543df8d1c..a811cb88ba7 100644 --- a/cpp/src/IceGrid/NodeCache.h +++ b/cpp/src/IceGrid/NodeCache.h @@ -13,6 +13,7 @@ #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> #include <IceGrid/Cache.h> +#include <IceGrid/Internal.h> namespace IceGrid { diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 1eb3fa4aca3..935928107fb 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -19,6 +19,10 @@ #include <IceGrid/WaitQueue.h> #include <IceGrid/TraceLevels.h> +#ifdef _WIN32 +# include <direct.h> // For _getcwd +#endif + using namespace std; using namespace IcePatch2; using namespace IceGrid; @@ -139,7 +143,7 @@ public: if(!_startedPatch) { Ice::Trace out(_traceLevels->logger, _traceLevels->patchCat); - int roundedSize = totalSize / 1024; + int roundedSize = static_cast<int>(static_cast<double>(totalSize) / 1024); if(roundedSize == 0 && totalSize > 0) { roundedSize = 1; @@ -303,11 +307,12 @@ NodeI::destroyServer(const string& name, const Ice::Current& current) void NodeI::patch(const Ice::StringSeq& directories, const Ice::StringSeq& serverDirs, const Ice::Current&) { - for(Ice::StringSeq::const_iterator p = directories.begin(); p != directories.end(); ++p) + Ice::StringSeq::const_iterator p; + for(p = directories.begin(); p != directories.end(); ++p) { patch(ServerIPtr(), *p); } - for(Ice::StringSeq::const_iterator p = serverDirs.begin(); p != serverDirs.end(); ++p) + for(p = serverDirs.begin(); p != serverDirs.end(); ++p) { patch(ServerIPtr(), _serversDir + "/" + *p + "/data"); } @@ -349,7 +354,8 @@ NodeI::patch(const ServerIPtr& server, const string& directory) const try { vector<string> running; - for(set<ServerIPtr>::const_iterator p = patch.servers.begin(); p != patch.servers.end(); ++p) + set<ServerIPtr>::const_iterator p; + for(p = patch.servers.begin(); p != patch.servers.end(); ++p) { if(*p != server) { @@ -428,7 +434,7 @@ NodeI::patch(const ServerIPtr& server, const string& directory) const throw PatchException(msg); } - for(set<ServerIPtr>::const_iterator p = patch.servers.begin(); p != patch.servers.end(); ++p) + for(p = patch.servers.begin(); p != patch.servers.end(); ++p) { if(*p != server) { @@ -516,13 +522,15 @@ NodeI::keepAlive() setSession(RegistryPrx::uncheckedCast(registry)->registerNode(_name, _proxy)); checkConsistency(); } - catch(const NodeActiveException& ex) + catch(const NodeActiveException&) { _traceLevels->logger->error("a node with the same name is already registered and active"); } catch(const Ice::LocalException& ex) { - _traceLevels->logger->warning("couldn't contact the IceGrid registry"); + ostringstream os; + os << "couldn't contact the IceGrid registry:\n" << ex; + _traceLevels->logger->warning(os.str()); } } } @@ -690,13 +698,14 @@ NodeI::checkConsistencyNoSync(const Ice::StringSeq& servers) try { - for(Ice::StringSeq::const_iterator p = contents.begin(); p != --contents.end(); ++p) + Ice::StringSeq::const_iterator p; + for(p = contents.begin(); p != --contents.end(); ++p) { rename(_tmpDir + "/" + *(p + 1), _tmpDir + "/" + *p); } createDirectoryRecursive(_tmpDir + "/servers-0"); - for(vector<string>::const_iterator p = remove.begin(); p != remove.end(); ++p) + for(p = remove.begin(); p != remove.end(); ++p) { rename(_serversDir + "/" + *p, _tmpDir + "/servers-0/" + *p); } @@ -724,7 +733,8 @@ NodeI::canRemoveServerDirectory(const string& name) contents = readDirectory(_serversDir + "/" + name + "/config"); - for(Ice::StringSeq::const_iterator p = contents.begin() ; p != contents.end(); ++p) + Ice::StringSeq::const_iterator p; + for(p = contents.begin() ; p != contents.end(); ++p) { if(p->find("config") != 0) { @@ -733,7 +743,7 @@ NodeI::canRemoveServerDirectory(const string& name) } contents = readDirectory(_serversDir + "/" + name + "/dbs"); - for(Ice::StringSeq::const_iterator p = contents.begin() ; p != contents.end(); ++p) + for(p = contents.begin() ; p != contents.end(); ++p) { Ice::StringSeq files = readDirectory(_serversDir + "/" + name + "/dbs/" + *p); remove(files.begin(), files.end(), "DB_CONFIG"); diff --git a/cpp/src/IceGrid/ObjectCache.h b/cpp/src/IceGrid/ObjectCache.h index ab0467a71bb..1247b664b1c 100644 --- a/cpp/src/IceGrid/ObjectCache.h +++ b/cpp/src/IceGrid/ObjectCache.h @@ -14,6 +14,7 @@ #include <IceUtil/Shared.h> #include <Ice/CommunicatorF.h> #include <IceGrid/Cache.h> +#include <IceGrid/Internal.h> namespace IceGrid { diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 7589511dbf8..c3f163f1321 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -22,8 +22,7 @@ #include <IceGrid/SessionManagerI.h> #include <IceGrid/Topics.h> -#include <IceStorm/TraceLevels.h> -#include <IceStorm/TopicManagerI.h> +#include <IceStorm/Service.h> #include <sys/types.h> #include <sys/stat.h> @@ -313,11 +312,11 @@ RegistryI::start(bool nowarn) // // Create the internal IceStorm service. // - IceStorm::TraceLevelsPtr t = new IceStorm::TraceLevels("IceGrid.Registry", properties, _communicator->getLogger()); - _topicManager = new IceStorm::TopicManagerI( - _communicator, registryAdapter, registryAdapter, t, "Registry", "topics"); - _topicManagerProxy = IceStorm::TopicManagerPrx::uncheckedCast( - registryAdapter->add(_topicManager, stringToIdentity("IceGrid/TopicManager"))); + const string topicMgrIdProperty = "IceGrid.Registry.TopicManagerIdentity"; + Identity topicMgrId = stringToIdentity(properties->getPropertyWithDefault(topicMgrIdProperty, + "IceGrid/TopicManager")); + _iceStorm = IceStorm::Service::create(_communicator, registryAdapter, registryAdapter, "IceGrid.Registry", + topicMgrId, "Registry"); // // Create the registry and node observer topic. @@ -326,19 +325,19 @@ RegistryI::start(bool nowarn) IceStorm::TopicPrx registryObserverTopic; try { - registryObserverTopic = _topicManagerProxy->create("RegistryObserver"); + registryObserverTopic = _iceStorm->getTopicManager()->create("RegistryObserver"); } catch(const IceStorm::TopicExists&) { - registryObserverTopic = _topicManagerProxy->retrieve("RegistryObserver"); + registryObserverTopic = _iceStorm->getTopicManager()->retrieve("RegistryObserver"); } try { - nodeObserverTopic = _topicManagerProxy->create("NodeObserver"); + nodeObserverTopic = _iceStorm->getTopicManager()->create("NodeObserver"); } catch(const IceStorm::TopicExists&) { - nodeObserverTopic = _topicManagerProxy->retrieve("NodeObserver"); + nodeObserverTopic = _iceStorm->getTopicManager()->retrieve("NodeObserver"); } obj = nodeObserverTopic->getPublisher()->ice_collocationOptimization(false); @@ -396,7 +395,7 @@ RegistryI::stop() _reaper->terminate(); _reaper->getThreadControl().join(); - _topicManager->shutdown(); + _iceStorm->stop(); } NodeSessionPrx @@ -424,5 +423,5 @@ RegistryI::shutdown(const Ice::Current& current) IceStorm::TopicManagerPrx RegistryI::getTopicManager() { - return _topicManagerProxy; + return _iceStorm->getTopicManager(); } diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h index 9982dbe6388..7932e3cac42 100644 --- a/cpp/src/IceGrid/RegistryI.h +++ b/cpp/src/IceGrid/RegistryI.h @@ -11,15 +11,7 @@ #define ICE_GRID_REGISTRYI_H #include <IceGrid/Internal.h> -#include <IceStorm/IceStorm.h> - -namespace IceStorm -{ - -class TopicManagerI; -typedef IceUtil::Handle<TopicManagerI> TopicManagerIPtr; - -} +#include <IceStorm/Service.h> namespace IceGrid { @@ -53,8 +45,7 @@ private: ReapThreadPtr _reaper; int _nodeSessionTimeout; - IceStorm::TopicManagerIPtr _topicManager; - IceStorm::TopicManagerPrx _topicManagerProxy; + IceStorm::ServicePtr _iceStorm; RegistryObserverPrx _registryObserver; NodeObserverPrx _nodeObserver; }; diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 5f3eede2aad..e6d19133fbe 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -158,7 +158,7 @@ ServerEntry::sync() string node; try { - sync(adapters, at, dt, node); + syncImpl(adapters, at, dt, node); } catch(const NodeUnreachableException&) { @@ -252,13 +252,13 @@ ServerEntry::getProxy(int& activationTimeout, int& deactivationTimeout, string& proxy->ice_ping(); return proxy; } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { } } StringAdapterPrxDict adapters; - proxy = sync(adapters, activationTimeout, deactivationTimeout, node); + proxy = syncImpl(adapters, activationTimeout, deactivationTimeout, node); if(!proxy) { throw ServerNotExistException(); @@ -285,7 +285,7 @@ ServerEntry::getAdapter(const string& id) proxy->ice_ping(); return proxy; } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { } } @@ -293,7 +293,7 @@ ServerEntry::getAdapter(const string& id) StringAdapterPrxDict adapters; int activationTimeout, deactivationTimeout; string node; - sync(adapters, activationTimeout, deactivationTimeout, node); + syncImpl(adapters, activationTimeout, deactivationTimeout, node); AdapterPrx adapter = adapters[id]; if(!adapter) { @@ -303,7 +303,7 @@ ServerEntry::getAdapter(const string& id) } ServerPrx -ServerEntry::sync(map<string, AdapterPrx>& adapters, int& activationTimeout, int& deactivationTimeout, string& node) +ServerEntry::syncImpl(map<string, AdapterPrx>& adpts, int& activationTimeout, int& deactivationTimeout, string& node) { ServerDescriptorPtr load; string loadNode; @@ -344,14 +344,14 @@ ServerEntry::sync(map<string, AdapterPrx>& adapters, int& activationTimeout, int { db.getNode(destroyNode)->destroyServer(destroy->id); } - catch(const NodeNotExistException& ex) + catch(const NodeNotExistException&) { if(!load) { throw NodeUnreachableException(); } } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { if(!load) { @@ -364,11 +364,11 @@ ServerEntry::sync(map<string, AdapterPrx>& adapters, int& activationTimeout, int { try { - proxy = db.getNode(loadNode)->loadServer(load, adapters, activationTimeout, deactivationTimeout); + proxy = db.getNode(loadNode)->loadServer(load, adpts, activationTimeout, deactivationTimeout); node = loadNode; proxy = ServerPrx::uncheckedCast(proxy->ice_collocationOptimization(false)); } - catch(const NodeNotExistException& ex) + catch(const NodeNotExistException&) { throw NodeUnreachableException(); } @@ -386,7 +386,7 @@ ServerEntry::sync(map<string, AdapterPrx>& adapters, int& activationTimeout, int } } } - catch(const NodeUnreachableException& ex) + catch(const NodeUnreachableException&) { { Lock sync(*this); @@ -420,7 +420,7 @@ ServerEntry::sync(map<string, AdapterPrx>& adapters, int& activationTimeout, int int timeout = db.getNodeSessionTimeout() * 1000; // sec to ms _proxy = ServerPrx::uncheckedCast(proxy->ice_timeout(timeout)); _adapters.clear(); - for(StringAdapterPrxDict::const_iterator p = adapters.begin(); p != adapters.end(); ++p) + for(StringAdapterPrxDict::const_iterator p = adpts.begin(); p != adpts.end(); ++p) { AdapterPrx adapter = AdapterPrx::uncheckedCast(p->second->ice_timeout(timeout)); _adapters.insert(make_pair(p->first, adapter)); diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h index e8b1b568f1a..625b31caee4 100644 --- a/cpp/src/IceGrid/ServerCache.h +++ b/cpp/src/IceGrid/ServerCache.h @@ -47,7 +47,7 @@ public: private: - ServerPrx sync(StringAdapterPrxDict&, int&, int&, std::string&); + ServerPrx syncImpl(StringAdapterPrxDict&, int&, int&, std::string&); ServerCache& _cache; const std::string _id; diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 696c017896c..db592fcfe73 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -933,7 +933,7 @@ ServerI::updateImpl(const ServerDescriptorPtr& descriptor, bool load, StringAdap throw "can't find `data' directory in `" + _serverDir + "'"; } } - catch(const string& msg) + catch(const string&) { // // TODO: log message? @@ -968,7 +968,8 @@ ServerI::updateImpl(const ServerDescriptorPtr& descriptor, bool load, StringAdap Ice::StringSeq configFiles = readDirectory(_serverDir + "/config"); Ice::StringSeq toDel; set_difference(configFiles.begin(), configFiles.end(), knownFiles.begin(), knownFiles.end(), back_inserter(toDel)); - for(Ice::StringSeq::const_iterator p = toDel.begin(); p != toDel.end(); ++p) + Ice::StringSeq::const_iterator p; + for(p = toDel.begin(); p != toDel.end(); ++p) { if(p->find("config_") == 0) { @@ -988,10 +989,10 @@ ServerI::updateImpl(const ServerDescriptorPtr& descriptor, bool load, StringAdap // Update the database environments if necessary. // Ice::StringSeq knownDbEnvs; - for(DbEnvDescriptorSeq::const_iterator p = descriptor->dbEnvs.begin(); p != descriptor->dbEnvs.end(); ++p) + for(DbEnvDescriptorSeq::const_iterator q = descriptor->dbEnvs.begin(); q != descriptor->dbEnvs.end(); ++q) { - updateDbEnv(_serverDir, *p); - knownDbEnvs.push_back(p->name); + updateDbEnv(_serverDir, *q); + knownDbEnvs.push_back(q->name); } // @@ -1000,7 +1001,7 @@ ServerI::updateImpl(const ServerDescriptorPtr& descriptor, bool load, StringAdap Ice::StringSeq dbEnvs = readDirectory(_serverDir + "/dbs"); toDel.clear(); set_difference(dbEnvs.begin(), dbEnvs.end(), knownDbEnvs.begin(), knownDbEnvs.end(), back_inserter(toDel)); - for(Ice::StringSeq::const_iterator p = toDel.begin(); p != toDel.end(); ++p) + for(p = toDel.begin(); p != toDel.end(); ++p) { try { @@ -1019,28 +1020,28 @@ ServerI::updateImpl(const ServerDescriptorPtr& descriptor, bool load, StringAdap _processRegistered = false; map<string, ServerAdapterIPtr> oldAdapters; oldAdapters.swap(_adapters); - for(AdapterDescriptorSeq::const_iterator p = descriptor->adapters.begin(); p != descriptor->adapters.end(); ++p) + for(AdapterDescriptorSeq::const_iterator r = descriptor->adapters.begin(); r != descriptor->adapters.end(); ++r) { - adapters.insert(make_pair(p->id, addAdapter(*p, current))); - oldAdapters.erase(p->id); + adapters.insert(make_pair(r->id, addAdapter(*r, current))); + oldAdapters.erase(r->id); } if(iceBox) { - for(ServiceInstanceDescriptorSeq::const_iterator p = iceBox->services.begin(); p != iceBox->services.end(); ++p) + for(ServiceInstanceDescriptorSeq::const_iterator s = iceBox->services.begin(); s != iceBox->services.end(); ++s) { - ServiceDescriptorPtr s = ServiceDescriptorPtr::dynamicCast(p->descriptor); - for(AdapterDescriptorSeq::const_iterator q = s->adapters.begin(); q != s->adapters.end(); ++q) + ServiceDescriptorPtr svc = ServiceDescriptorPtr::dynamicCast(s->descriptor); + for(AdapterDescriptorSeq::const_iterator t = svc->adapters.begin(); t != svc->adapters.end(); ++t) { - adapters.insert(make_pair(q->id, addAdapter(*q, current))); - oldAdapters.erase(q->id); + adapters.insert(make_pair(t->id, addAdapter(*t, current))); + oldAdapters.erase(t->id); } } } - for(map<string, ServerAdapterIPtr>::const_iterator p = oldAdapters.begin(); p != oldAdapters.end(); ++p) + for(map<string, ServerAdapterIPtr>::const_iterator t = oldAdapters.begin(); t != oldAdapters.end(); ++t) { try { - p->second->destroy(current); + t->second->destroy(current); } catch(const Ice::LocalException&) { @@ -1125,13 +1126,13 @@ ServerI::updateConfigFile(const string& serverDir, const CommunicatorDescriptorP // // Add object adapter properties. // - for(AdapterDescriptorSeq::const_iterator p = descriptor->adapters.begin(); p != descriptor->adapters.end(); ++p) + for(AdapterDescriptorSeq::const_iterator q = descriptor->adapters.begin(); q != descriptor->adapters.end(); ++q) { - props.push_back(createProperty("# Object adapter " + p->name)); - props.push_back(createProperty(p->name + ".AdapterId", p->id)); - if(p->registerProcess) + props.push_back(createProperty("# Object adapter " + q->name)); + props.push_back(createProperty(q->name + ".AdapterId", q->id)); + if(q->registerProcess) { - props.push_back(createProperty(p->name + ".RegisterProcess", "1")); + props.push_back(createProperty(q->name + ".RegisterProcess", "1")); } } @@ -1197,7 +1198,7 @@ ServerI::updateDbEnv(const string& serverDir, const DbEnvDescriptor& dbEnv) { IcePatch2::createDirectory(dbEnvHome); } - catch(const string& message) + catch(const string&) { } } diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h index 873b3e84913..7cbf3905f6f 100644 --- a/cpp/src/IceGrid/Util.h +++ b/cpp/src/IceGrid/Util.h @@ -10,8 +10,8 @@ #ifndef ICE_GRID_UTIL_H #define ICE_GRID_UTIL_H +#include <IceGrid/Descriptor.h> #include <IceUtil/StringUtil.h> -#include <IceGrid/Internal.h> namespace IceGrid { diff --git a/cpp/src/IceGrid/dummy1.ice b/cpp/src/IceGrid/dummy1.ice index 5b12cf78938..9c077c99f56 100755 --- a/cpp/src/IceGrid/dummy1.ice +++ b/cpp/src/IceGrid/dummy1.ice @@ -1,3 +1,3 @@ // -// This file is necessary to compile IdentityObjectDescDict under msdev. -// +// This file is necessary to compile IdentityObjectInfoDict under msdev.
+//D diff --git a/cpp/src/IceGrid/dummy2.ice b/cpp/src/IceGrid/dummy2.ice index 2e6d4088952..108a113ddf9 100755 --- a/cpp/src/IceGrid/dummy2.ice +++ b/cpp/src/IceGrid/dummy2.ice @@ -1,3 +1,3 @@ // -// This file is necessary to compile StringObjectProxyDict under msdev. +// This file is necessary to compile StringObjectProxiesDict under msdev. // diff --git a/cpp/src/IceGrid/dummy3.ice b/cpp/src/IceGrid/dummy3.ice index 46a7ad0cb73..6942f905586 100755 --- a/cpp/src/IceGrid/dummy3.ice +++ b/cpp/src/IceGrid/dummy3.ice @@ -1,3 +1,3 @@ // -// This file is necessary to compile StringObjectProxySeqDict under msdev. +// This file is necessary to compile StringApplicationDescriptorDict under msdev. // diff --git a/cpp/src/IceGrid/icegrid.dsp b/cpp/src/IceGrid/icegrid.dsp index 085438c8931..01b11dd9030 100644 --- a/cpp/src/IceGrid/icegrid.dsp +++ b/cpp/src/IceGrid/icegrid.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /D "_USRDLL" /D "ICE_GRID_API_EXPORTS" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /D "_USRDLL" /D "ICE_GRID_API_EXPORTS" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -76,7 +76,7 @@ PostBuild_Cmds=copy $(OutDir)\icegrid.lib ..\..\lib copy $(OutDir)\icegrid21.dll # 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 "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_USRDLL" /D "ICE_GRID_API_EXPORTS" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_USRDLL" /D "ICE_GRID_API_EXPORTS" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
# SUBTRACT CPP /Fr /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -87,8 +87,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icegrid21d.dll" /implib:"Debug/icegridd.lib"
-# SUBTRACT LINK32 /pdb:none /incremental:no /nodefaultlib
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icegrid21d.dll" /implib:"Debug/icegridd.lib" /FIXED:no
+# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
@@ -110,10 +110,22 @@ SOURCE=.\Admin.cpp # End Source File
# Begin Source File
+SOURCE=.\Descriptor.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Exception.cpp
# End Source File
# Begin Source File
+SOURCE=.\Observer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PerfTypes.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Query.cpp
# End Source File
# End Group
@@ -181,6 +193,49 @@ BuildCmds= \ # End Source File
# Begin Source File
+SOURCE=..\..\slice\icegrid\Descriptor.ice
+
+!IF "$(CFG)" == "icegrid - Win32 Release"
+
+USERDEP__DESCR="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
+# Begin Custom Build
+InputPath=..\..\slice\icegrid\Descriptor.ice
+
+BuildCmds= \
+ ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Descriptor.ice \
+ move Descriptor.h ..\..\include\icegrid \
+
+
+"..\..\include\icegrid\Descriptor.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Descriptor.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "icegrid - Win32 Debug"
+
+USERDEP__DESCR="..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
+# Begin Custom Build
+InputPath=..\..\slice\icegrid\Descriptor.ice
+
+BuildCmds= \
+ ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Descriptor.ice \
+ move Descriptor.h ..\..\include\icegrid \
+
+
+"..\..\include\icegrid\Descriptor.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Descriptor.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=..\..\slice\icegrid\Exception.ice
!IF "$(CFG)" == "icegrid - Win32 Release"
@@ -224,6 +279,92 @@ BuildCmds= \ # End Source File
# Begin Source File
+SOURCE=..\..\slice\icegrid\Observer.ice
+
+!IF "$(CFG)" == "icegrid - Win32 Release"
+
+USERDEP__OBSER="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
+# Begin Custom Build
+InputPath=..\..\slice\icegrid\Observer.ice
+
+BuildCmds= \
+ ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Observer.ice \
+ move Observer.h ..\..\include\icegrid \
+
+
+"..\..\include\icegrid\Observer.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Observer.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "icegrid - Win32 Debug"
+
+USERDEP__OBSER="..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
+# Begin Custom Build
+InputPath=..\..\slice\icegrid\Observer.ice
+
+BuildCmds= \
+ ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Observer.ice \
+ move Observer.h ..\..\include\icegrid \
+
+
+"..\..\include\icegrid\Observer.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Observer.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\icegrid\PerfTypes.ice
+
+!IF "$(CFG)" == "icegrid - Win32 Release"
+
+USERDEP__PERFT="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
+# Begin Custom Build
+InputPath=..\..\slice\icegrid\PerfTypes.ice
+
+BuildCmds= \
+ ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/PerfTypes.ice \
+ move PerfTypes.h ..\..\include\icegrid \
+
+
+"..\..\include\icegrid\PerfTypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"PerfTypes.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "icegrid - Win32 Debug"
+
+USERDEP__PERFT="..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
+# Begin Custom Build
+InputPath=..\..\slice\icegrid\PerfTypes.ice
+
+BuildCmds= \
+ ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/PerfTypes.ice \
+ move PerfTypes.h ..\..\include\icegrid \
+
+
+"..\..\include\icegrid\PerfTypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"PerfTypes.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=..\..\slice\icegrid\Query.ice
!IF "$(CFG)" == "icegrid - Win32 Release"
diff --git a/cpp/src/IceGrid/icegridadmin.dsp b/cpp/src/IceGrid/icegridadmin.dsp new file mode 100755 index 00000000000..967c2487c1e --- /dev/null +++ b/cpp/src/IceGrid/icegridadmin.dsp @@ -0,0 +1,236 @@ +# Microsoft Developer Studio Project File - Name="icegridadmin" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=icegridadmin - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "icegridadmin.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 "icegridadmin.mak" CFG="icegridadmin - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "icegridadmin - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "icegridadmin - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "icegridadmin - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /I "dummyinclude" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 setargv.obj /nologo /subsystem:console /incremental:yes /machine:I386 /libpath:"../../../lib"
+# SUBTRACT LINK32 /debug /nodefaultlib
+# Begin Special Build Tool
+OutDir=.\Release
+TargetName=icegridadmin
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe ..\..\bin
+# End Special Build Tool
+
+!ELSEIF "$(CFG)" == "icegridadmin - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /I "dummyinclude" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 setargv.obj /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+OutDir=.\Debug
+TargetName=icegridadmin
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe ..\..\bin
+# End Special Build Tool
+
+!ENDIF
+
+# Begin Target
+
+# Name "icegridadmin - Win32 Release"
+# Name "icegridadmin - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\DescriptorBuilder.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\DescriptorHelper.cpp
+
+!IF "$(CFG)" == "icegridadmin - Win32 Release"
+
+!ELSEIF "$(CFG)" == "icegridadmin - Win32 Debug"
+
+# ADD CPP /Ze
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\DescriptorParser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Grammar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Parser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Scanner.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Util.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Grammar.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Parser.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\Grammar.y
+
+!IF "$(CFG)" == "icegridadmin - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\Grammar.y
+
+BuildCmds= \
+ bison -dvt Grammar.y \
+ move Grammar.tab.c Grammar.cpp \
+ move Grammar.tab.h Grammar.h \
+
+
+"Grammar.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Grammar.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "icegridadmin - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\Grammar.y
+
+BuildCmds= \
+ bison -dvt Grammar.y \
+ move Grammar.tab.c Grammar.cpp \
+ move Grammar.tab.h Grammar.h \
+
+
+"Grammar.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Grammar.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Scanner.l
+
+!IF "$(CFG)" == "icegridadmin - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\Scanner.l
+
+"Scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex Scanner.l
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "icegridadmin - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\Scanner.l
+
+"Scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex Scanner.l
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/cpp/src/IceGrid/icegridnode.dsp b/cpp/src/IceGrid/icegridnode.dsp index 0779e56d153..39b57187879 100755 --- a/cpp/src/IceGrid/icegridnode.dsp +++ b/cpp/src/IceGrid/icegridnode.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /I "dummyinclude" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /I "dummyinclude" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -74,7 +74,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe ..\..\bin # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /I "dummyinclude" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /I "dummyinclude" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -83,8 +83,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ws2_32.lib setargv.obj /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../lib"
-# SUBTRACT LINK32 /incremental:no /nodefaultlib
+# ADD LINK32 ws2_32.lib setargv.obj /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
OutDir=.\Debug
TargetName=icegridnode
@@ -107,23 +107,23 @@ SOURCE=.\Activator.cpp # End Source File
# Begin Source File
-SOURCE=.\AdapterFactory.cpp
+SOURCE=.\AdapterCache.cpp
# End Source File
# Begin Source File
-SOURCE=.\AdapterI.cpp
+SOURCE=.\AdminI.cpp
# End Source File
# Begin Source File
-SOURCE=.\AdapterRegistryI.cpp
+SOURCE=.\Database.cpp
# End Source File
# Begin Source File
-SOURCE=.\AdminI.cpp
+SOURCE=.\DescriptorBuilder.cpp
# End Source File
# Begin Source File
-SOURCE=.\ApplicationRegistryI.cpp
+SOURCE=.\DescriptorHelper.cpp
# End Source File
# Begin Source File
@@ -131,43 +131,43 @@ SOURCE=.\DescriptorParser.cpp # End Source File
# Begin Source File
-SOURCE=.\DescriptorUtil.cpp
+SOURCE=.\icegridnode.cpp
# End Source File
# Begin Source File
-SOURCE=.\DescriptorVisitor.cpp
+SOURCE=.\IdentityObjectInfoDict.cpp
# End Source File
# Begin Source File
-SOURCE=.\icegridnode.cpp
+SOURCE=.\Internal.cpp
# End Source File
# Begin Source File
-SOURCE=.\IdentityObjectDescDict.cpp
+SOURCE=.\LocatorI.cpp
# End Source File
# Begin Source File
-SOURCE=.\Internal.cpp
+SOURCE=.\LocatorRegistryI.cpp
# End Source File
# Begin Source File
-SOURCE=.\LocatorI.cpp
+SOURCE=.\NodeCache.cpp
# End Source File
# Begin Source File
-SOURCE=.\LocatorRegistryI.cpp
+SOURCE=.\NodeI.cpp
# End Source File
# Begin Source File
-SOURCE=.\NodeI.cpp
+SOURCE=.\NodeSessionI.cpp
# End Source File
# Begin Source File
-SOURCE=.\NodeRegistryI.cpp
+SOURCE=.\ObjectCache.cpp
# End Source File
# Begin Source File
-SOURCE=.\ObjectRegistryI.cpp
+SOURCE=.\ObserverSessionI.cpp
# End Source File
# Begin Source File
@@ -175,7 +175,11 @@ SOURCE=.\QueryI.cpp # End Source File
# Begin Source File
-SOURCE=.\Registry.cpp
+SOURCE=.\ReapThread.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\RegistryI.cpp
# End Source File
# Begin Source File
@@ -183,7 +187,7 @@ SOURCE=.\ServerAdapterI.cpp # End Source File
# Begin Source File
-SOURCE=.\ServerFactory.cpp
+SOURCE=.\ServerCache.cpp
# End Source File
# Begin Source File
@@ -191,27 +195,27 @@ SOURCE=.\ServerI.cpp # End Source File
# Begin Source File
-SOURCE=.\ServerRegistryI.cpp
+SOURCE=.\SessionManagerI.cpp
# End Source File
# Begin Source File
-SOURCE=.\StringObjectProxyDict.cpp
+SOURCE=.\StringApplicationDescriptorDict.cpp
# End Source File
# Begin Source File
-SOURCE=.\StringObjectProxySeqDict.cpp
+SOURCE=.\StringObjectProxiesDict.cpp
# End Source File
# Begin Source File
-SOURCE=.\StringServerDescriptorDict.cpp
+SOURCE=.\Topics.cpp
# End Source File
# Begin Source File
-SOURCE=.\StringStringSeqDict.cpp
+SOURCE=.\TraceLevels.cpp
# End Source File
# Begin Source File
-SOURCE=.\TraceLevels.cpp
+SOURCE=.\Util.cpp
# End Source File
# Begin Source File
@@ -459,84 +463,6 @@ BuildCmds= \ # End Source File
# Begin Source File
-SOURCE=.\dummy4.ice
-
-!IF "$(CFG)" == "icegridnode - Win32 Release"
-
-USERDEP__DUMMY4="..\..\bin\slice2freeze.exe" "..\..\lib\slice.lib"
-# Begin Custom Build
-InputPath=.\dummy4.ice
-
-BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict IceGrid::StringStringSeqDict,string,Ice::StringSeq StringStringSeqDict ../../slice/Ice/BuiltinSequences.ice
-
-"StringStringSeqDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"StringStringSeqDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "icegridnode - Win32 Debug"
-
-USERDEP__DUMMY4="..\..\bin\slice2freeze.exe" "..\..\lib\sliced.lib"
-# Begin Custom Build
-InputPath=.\dummy4.ice
-
-BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict IceGrid::StringStringSeqDict,string,Ice::StringSeq StringStringSeqDict ../../slice/Ice/BuiltinSequences.ice
-
-"StringStringSeqDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"StringStringSeqDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\dummy5.ice
-
-!IF "$(CFG)" == "icegridnode - Win32 Release"
-
-USERDEP__DUMMY5="..\..\bin\slice2freeze.exe" "..\..\lib\slice.lib"
-# Begin Custom Build
-InputPath=.\dummy5.ice
-
-BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict IceGrid::StringServerDescriptorDict,string,IceGrid::ServerDescriptor StringServerDescriptorDict ../../slice/IceGrid/Admin.ice
-
-"StringServerDescriptorDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"StringServerDescriptorDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "icegridnode - Win32 Debug"
-
-USERDEP__DUMMY5="..\..\bin\slice2freeze.exe" "..\..\lib\sliced.lib"
-# Begin Custom Build
-InputPath=.\dummy5.ice
-
-BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict IceGrid::StringServerDescriptorDict,string,IceGrid::ServerDescriptor StringServerDescriptorDict ../../slice/IceGrid/Admin.ice
-
-"StringServerDescriptorDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"StringServerDescriptorDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Internal.ice
!IF "$(CFG)" == "icegridnode - Win32 Release"
diff --git a/cpp/src/IceGrid/icegridregistry.dsp b/cpp/src/IceGrid/icegridregistry.dsp index 86dd7dc03b7..4adafc50f19 100755 --- a/cpp/src/IceGrid/icegridregistry.dsp +++ b/cpp/src/IceGrid/icegridregistry.dsp @@ -8,12 +8,12 @@ CFG=icegridregistry - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "icegridRegistry.mak".
+!MESSAGE NMAKE /f "icegridregistry.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 "icegridRegistry.mak" CFG="icegridregistry - Win32 Debug"
+!MESSAGE NMAKE /f "icegridregistry.mak" CFG="icegridregistry - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /I "dummyinclude" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /I "dummyinclude" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -55,7 +55,7 @@ LINK32=link.exe # SUBTRACT LINK32 /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
-TargetName=icegridRegistry
+TargetName=icegridregistry
SOURCE="$(InputPath)"
PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe ..\..\bin
# End Special Build Tool
@@ -74,7 +74,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe ..\..\bin # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /I "dummyinclude" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /I "dummyinclude" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -83,11 +83,11 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 setargv.obj /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../lib"
-# SUBTRACT LINK32 /incremental:no /nodefaultlib
+# ADD LINK32 setargv.obj /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
OutDir=.\Debug
-TargetName=icegridRegistry
+TargetName=icegridregistry
SOURCE="$(InputPath)"
PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe ..\..\bin
# End Special Build Tool
@@ -103,92 +103,96 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe ..\..\bin # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\AdapterFactory.cpp
+SOURCE=.\AdapterCache.cpp
# End Source File
# Begin Source File
-SOURCE=.\AdapterI.cpp
+SOURCE=.\AdminI.cpp
# End Source File
# Begin Source File
-SOURCE=.\AdapterRegistryI.cpp
+SOURCE=.\Database.cpp
# End Source File
# Begin Source File
-SOURCE=.\AdminI.cpp
+SOURCE=.\DescriptorHelper.cpp
# End Source File
# Begin Source File
-SOURCE=.\ApplicationRegistryI.cpp
+SOURCE=.\icegridregistry.cpp
# End Source File
# Begin Source File
-SOURCE=.\DescriptorUtil.cpp
+SOURCE=.\IdentityObjectInfoDict.cpp
# End Source File
# Begin Source File
-SOURCE=.\DescriptorVisitor.cpp
+SOURCE=.\Internal.cpp
# End Source File
# Begin Source File
-SOURCE=.\icegridregistry.cpp
+SOURCE=.\LocatorI.cpp
# End Source File
# Begin Source File
-SOURCE=.\IdentityObjectDescDict.cpp
+SOURCE=.\LocatorRegistryI.cpp
# End Source File
# Begin Source File
-SOURCE=.\Internal.cpp
+SOURCE=.\NodeCache.cpp
# End Source File
# Begin Source File
-SOURCE=.\LocatorI.cpp
+SOURCE=.\NodeSessionI.cpp
# End Source File
# Begin Source File
-SOURCE=.\LocatorRegistryI.cpp
+SOURCE=.\ObjectCache.cpp
# End Source File
# Begin Source File
-SOURCE=.\NodeRegistryI.cpp
+SOURCE=.\ObserverSessionI.cpp
# End Source File
# Begin Source File
-SOURCE=.\ObjectRegistryI.cpp
+SOURCE=.\QueryI.cpp
# End Source File
# Begin Source File
-SOURCE=.\QueryI.cpp
+SOURCE=.\ReapThread.cpp
# End Source File
# Begin Source File
-SOURCE=.\Registry.cpp
+SOURCE=.\RegistryI.cpp
# End Source File
# Begin Source File
-SOURCE=.\ServerRegistryI.cpp
+SOURCE=.\ServerCache.cpp
# End Source File
# Begin Source File
-SOURCE=.\StringObjectProxyDict.cpp
+SOURCE=.\SessionManagerI.cpp
# End Source File
# Begin Source File
-SOURCE=.\StringObjectProxySeqDict.cpp
+SOURCE=.\StringApplicationDescriptorDict.cpp
# End Source File
# Begin Source File
-SOURCE=.\StringServerDescriptorDict.cpp
+SOURCE=.\StringObjectProxiesDict.cpp
# End Source File
# Begin Source File
-SOURCE=.\StringStringSeqDict.cpp
+SOURCE=.\Topics.cpp
# End Source File
# Begin Source File
SOURCE=.\TraceLevels.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\Util.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -219,7 +223,7 @@ SOURCE=.\ComponentBuilder.h # End Source File
# Begin Source File
-SOURCE=.\IdentityObjectDescDict.h
+SOURCE=.\IdentityObjectInfoDict.h
# End Source File
# Begin Source File
@@ -255,11 +259,11 @@ SOURCE=.\ServerRegistryI.h # End Source File
# Begin Source File
-SOURCE=.\StringObjectProxyDict.h
+SOURCE=.\StringApplicationDescriptorDict.h
# End Source File
# Begin Source File
-SOURCE=.\StringObjectProxySeqDict.h
+SOURCE=.\StringObjectProxiesDict.h
# End Source File
# Begin Source File
@@ -280,12 +284,12 @@ USERDEP__DUMMY="..\..\bin\slice2freeze.exe" "..\..\lib\slice.lib" InputPath=.\dummy1.ice
BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict IceGrid::IdentityObjectDescDict,Ice::Identity,IceGrid::ObjectDescriptor IdentityObjectDescDict ../../slice/Ice/Identity.ice ../IceGrid/Internal.ice
+ ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo --dict-index IceGrid::IdentityObjectInfoDict,type IdentityObjectInfoDict ../../slice/Ice/Identity.ice ../../slice/IceGrid/Admin.ice
-"IdentityObjectDescDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"IdentityObjectInfoDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"IdentityObjectDescDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"IdentityObjectInfoDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -296,12 +300,12 @@ USERDEP__DUMMY="..\..\bin\slice2freeze.exe" "..\..\lib\sliced.lib" InputPath=.\dummy1.ice
BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict IceGrid::IdentityObjectDescDict,Ice::Identity,IceGrid::ObjectDescriptor IdentityObjectDescDict ../../slice/Ice/Identity.ice ../IceGrid/Internal.ice
+ ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo --dict-index IceGrid::IdentityObjectInfoDict,type IdentityObjectInfoDict ../../slice/Ice/Identity.ice ../../slice/IceGrid/Admin.ice
-"IdentityObjectDescDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"IdentityObjectInfoDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"IdentityObjectDescDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"IdentityObjectInfoDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -319,12 +323,12 @@ USERDEP__DUMMY2="..\..\bin\slice2freeze.exe" "..\..\lib\slice.lib" InputPath=.\dummy2.ice
BuildCmds= \
- ..\..\bin\slice2freeze.exe --include-dir IceGrid --dict "IceGrid::StringObjectProxyDict,string,Object*" StringObjectProxyDict
+ ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict "IceGrid::StringObjectProxiesDict,string,IceGrid::StringObjectProxyDict" StringObjectProxiesDict ../IceGrid/Internal.ice
-"StringObjectProxyDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringObjectProxiesDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"StringObjectProxyDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringObjectProxiesDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -335,12 +339,12 @@ USERDEP__DUMMY2="..\..\bin\slice2freeze.exe" "..\..\lib\sliced.lib" InputPath=.\dummy2.ice
BuildCmds= \
- ..\..\bin\slice2freeze.exe --include-dir IceGrid --dict "IceGrid::StringObjectProxyDict,string,Object*" StringObjectProxyDict
+ ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict "IceGrid::StringObjectProxiesDict,string,IceGrid::StringObjectProxyDict" StringObjectProxiesDict ../IceGrid/Internal.ice
-"StringObjectProxyDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringObjectProxiesDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"StringObjectProxyDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringObjectProxiesDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -358,12 +362,12 @@ USERDEP__DUMMY3="..\..\bin\slice2freeze.exe" "..\..\lib\slice.lib" InputPath=.\dummy3.ice
BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict IceGrid::StringObjectProxySeqDict,string,Ice::ObjectProxySeq StringObjectProxySeqDict ../../slice/Ice/BuiltinSequences.ice
+ ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict IceGrid::StringApplicationDescriptorDict,string,IceGrid::ApplicationDescriptor StringApplicationDescriptorDict ../../slice/IceGrid/Admin.ice
-"StringObjectProxySeqDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringApplicationDescriptorDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"StringObjectProxySeqDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringApplicationDescriptorDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -374,12 +378,12 @@ USERDEP__DUMMY3="..\..\bin\slice2freeze.exe" "..\..\lib\sliced.lib" InputPath=.\dummy3.ice
BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict IceGrid::StringObjectProxySeqDict,string,Ice::ObjectProxySeq StringObjectProxySeqDict ../../slice/Ice/BuiltinSequences.ice
+ ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict IceGrid::StringApplicationDescriptorDict,string,IceGrid::ApplicationDescriptor StringApplicationDescriptorDict ../../slice/IceGrid/Admin.ice
-"StringObjectProxySeqDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringApplicationDescriptorDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"StringObjectProxySeqDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringApplicationDescriptorDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp index 851e328a4e8..c4587897df2 100644 --- a/cpp/src/IceStorm/Service.cpp +++ b/cpp/src/IceStorm/Service.cpp @@ -9,11 +9,7 @@ #include <IceStorm/TopicManagerI.h> #include <IceStorm/TraceLevels.h> -#include <IceBox/IceBox.h> - -#ifndef ICESTORM_SERVICE_API -# define ICESTORM_SERVICE_API ICE_DECLSPEC_EXPORT -#endif +#include <IceStorm/Service.h> using namespace std; using namespace Ice; @@ -23,7 +19,7 @@ using namespace Freeze; namespace IceStorm { -class ICESTORM_SERVICE_API ServiceI : public ::IceBox::Service +class ServiceI : public ::IceStorm::Service { public: @@ -34,11 +30,21 @@ public: const CommunicatorPtr&, const StringSeq&); + virtual void start(const CommunicatorPtr&, + const ObjectAdapterPtr&, + const ObjectAdapterPtr&, + const string&, + const Ice::Identity&, + const string&); + + virtual TopicManagerPrx getTopicManager() const; + virtual void stop(); private: TopicManagerIPtr _manager; + TopicManagerPrx _managerProxy; ObjectAdapterPtr _topicAdapter; ObjectAdapterPtr _publishAdapter; }; @@ -48,7 +54,7 @@ private: extern "C" { -ICESTORM_SERVICE_API ::IceBox::Service* +ICE_STORM_SERVICE_API ::IceBox::Service* create(CommunicatorPtr communicator) { return new ServiceI; @@ -56,6 +62,20 @@ create(CommunicatorPtr communicator) } +ServicePtr +IceStorm::Service::create(const CommunicatorPtr& communicator, + const ObjectAdapterPtr& topicAdapter, + const ObjectAdapterPtr& publishAdapter, + const string& name, + const Ice::Identity& id, + const string& dbEnv) +{ + ServiceI* service = new ServiceI; + ServicePtr svc = service; + service->start(communicator, topicAdapter, publishAdapter, name, id, dbEnv); + return svc; +} + IceStorm::ServiceI::ServiceI() { } @@ -76,18 +96,48 @@ IceStorm::ServiceI::start(const string& name, // // We use the name of the service for the name of the database environment. // + Ice::Identity id = stringToIdentity(name + "/TopicManager"); _manager = new TopicManagerI(communicator, _topicAdapter, _publishAdapter, traceLevels, name, "topics"); - _topicAdapter->add(_manager, stringToIdentity(name + "/TopicManager")); + _managerProxy = TopicManagerPrx::uncheckedCast(_topicAdapter->add(_manager, id)); _topicAdapter->activate(); _publishAdapter->activate(); } void +IceStorm::ServiceI::start(const CommunicatorPtr& communicator, + const ObjectAdapterPtr& topicAdapter, + const ObjectAdapterPtr& publishAdapter, + const string& name, + const Ice::Identity& id, + const string& dbEnv) +{ + TraceLevelsPtr traceLevels = new TraceLevels(name, communicator->getProperties(), communicator->getLogger()); + + // + // We use the name of the service for the name of the database environment. + // + _manager = new TopicManagerI(communicator, topicAdapter, publishAdapter, traceLevels, dbEnv, "topics"); + _managerProxy = TopicManagerPrx::uncheckedCast(topicAdapter->add(_manager, id)); +} + +TopicManagerPrx +IceStorm::ServiceI::getTopicManager() const +{ + return _managerProxy; +} + +void IceStorm::ServiceI::stop() { - _topicAdapter->deactivate(); - _publishAdapter->deactivate(); + if(_topicAdapter) + { + _topicAdapter->deactivate(); + } + if(_publishAdapter) + { + _publishAdapter->deactivate(); + } // // It's necessary to reap all destroyed topics on shutdown. diff --git a/cpp/src/IceStorm/icestormS.dsp b/cpp/src/IceStorm/icestormS.dsp index 29e5ce532df..6a757583f8a 100644 --- a/cpp/src/IceStorm/icestormS.dsp +++ b/cpp/src/IceStorm/icestormS.dsp @@ -76,8 +76,7 @@ PostBuild_Cmds=copy $(OutDir)\icestormservice.lib ..\..\lib copy $(OutDir)\icest # 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 "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_USRDLL" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
-# SUBTRACT CPP /Fr /YX
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_USRDLL" /D "ICE_STORM_SERVICE_API_EXPORTS" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/cpp/test/IceGrid/deployer/icegriddeployerC.dsp b/cpp/test/IceGrid/deployer/icegriddeployerC.dsp new file mode 100644 index 00000000000..c8b37dc9f19 --- /dev/null +++ b/cpp/test/IceGrid/deployer/icegriddeployerC.dsp @@ -0,0 +1,157 @@ +# Microsoft Developer Studio Project File - Name="icegriddeployerC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=icegriddeployerC - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "icegriddeployerC.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 "icegriddeployerC.mak" CFG="icegriddeployerC - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "icegriddeployerC - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "icegriddeployerC - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "icegriddeployerC - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# SUBTRACT LINK32 /debug /nodefaultlib
+
+!ELSEIF "$(CFG)" == "icegriddeployerC - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "icegriddeployerC - Win32 Release"
+# Name "icegriddeployerC - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\AllTests.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Test.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Test.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\Test.ice
+
+!IF "$(CFG)" == "icegriddeployerC - Win32 Release"
+
+USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
+# Begin Custom Build
+InputPath=.\Test.ice
+
+BuildCmds= \
+ ..\..\..\bin\slice2cpp.exe Test.ice
+
+"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "icegriddeployerC - Win32 Debug"
+
+USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
+# Begin Custom Build
+InputPath=.\Test.ice
+
+BuildCmds= \
+ ..\..\..\bin\slice2cpp.exe Test.ice
+
+"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/cpp/test/IceGrid/deployer/icegriddeployerS.dsp b/cpp/test/IceGrid/deployer/icegriddeployerS.dsp new file mode 100644 index 00000000000..1609331d75e --- /dev/null +++ b/cpp/test/IceGrid/deployer/icegriddeployerS.dsp @@ -0,0 +1,161 @@ +# Microsoft Developer Studio Project File - Name="icegriddeployerS" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=icegriddeployerS - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "icegriddeployerS.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 "icegriddeployerS.mak" CFG="icegriddeployerS - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "icegriddeployerS - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "icegriddeployerS - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "icegriddeployerS - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# SUBTRACT LINK32 /debug /nodefaultlib
+
+!ELSEIF "$(CFG)" == "icegriddeployerS - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "icegriddeployerS - Win32 Release"
+# Name "icegriddeployerS - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Server.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Test.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestI.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Test.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestI.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\Test.ice
+
+!IF "$(CFG)" == "icegriddeployerS - Win32 Release"
+
+USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
+# Begin Custom Build
+InputPath=.\Test.ice
+
+BuildCmds= \
+ ..\..\..\bin\slice2cpp.exe Test.ice
+
+"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "icegriddeployerS - Win32 Debug"
+
+USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
+# Begin Custom Build
+InputPath=.\Test.ice
+
+BuildCmds= \
+ ..\..\..\bin\slice2cpp.exe Test.ice
+
+"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/cpp/test/IceGrid/deployer/icegriddeployerSvc.dsp b/cpp/test/IceGrid/deployer/icegriddeployerSvc.dsp new file mode 100644 index 00000000000..06858c6f716 --- /dev/null +++ b/cpp/test/IceGrid/deployer/icegriddeployerSvc.dsp @@ -0,0 +1,176 @@ +# Microsoft Developer Studio Project File - Name="icegriddeployerSvc" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=icegriddeployerSvc - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "icegriddeployerSvc.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 "icegriddeployerSvc.mak" CFG="icegriddeployerSvc - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "icegriddeployerSvc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "icegriddeployerSvc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "icegriddeployerSvc - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /D "_USRDLL" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 /nologo /dll /incremental:yes /machine:I386 /out:"Release/testservice.dll"
+# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
+# Begin Special Build Tool
+OutDir=.\Release
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy $(OutDir)\testservice.* .
+# End Special Build Tool
+
+!ELSEIF "$(CFG)" == "icegriddeployerSvc - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# 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 "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /D "_USRDLL" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/testserviced.dll"
+# SUBTRACT LINK32 /pdb:none /incremental:no /nodefaultlib
+# Begin Special Build Tool
+OutDir=.\Debug
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy $(OutDir)\testserviced.* .
+# End Special Build Tool
+
+!ENDIF
+
+# Begin Target
+
+# Name "icegriddeployerSvc - Win32 Release"
+# Name "icegriddeployerSvc - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Service.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Test.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestI.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Test.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestI.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\Test.ice
+
+!IF "$(CFG)" == "icegriddeployerSvc - Win32 Release"
+
+USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
+# Begin Custom Build
+InputPath=.\Test.ice
+
+BuildCmds= \
+ ..\..\..\bin\slice2cpp.exe Test.ice
+
+"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "icegriddeployerSvc - Win32 Debug"
+
+USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
+# Begin Custom Build
+InputPath=.\Test.ice
+
+BuildCmds= \
+ ..\..\..\bin\slice2cpp.exe Test.ice
+
+"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index 2355942e38b..e676ca80dc5 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -44,7 +44,7 @@ public: (*p)->keepAlive(); ++p; } - catch(const Ice::Exception& ex) + catch(const Ice::Exception&) { p = _sessions.erase(p); } @@ -397,7 +397,7 @@ allTests(const Ice::CommunicatorPtr& communicator) session1->addApplication(ApplicationDescriptor()); test(false); } - catch(const AccessDenied& ex) + catch(const AccessDenied&) { } @@ -422,7 +422,7 @@ allTests(const Ice::CommunicatorPtr& communicator) session1->startUpdate(serial); ApplicationUpdateDescriptor update; update.name = "Application"; - update.variables.insert(make_pair("test", "test")); + update.variables.insert(make_pair(string("test"), string("test"))); session1->updateApplication(update); session1->finishUpdate(); } @@ -472,7 +472,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { session1->startUpdate(serial); } - catch(const Ice::UserException& ex) + catch(const Ice::UserException&) { test(false); } @@ -483,7 +483,7 @@ allTests(const Ice::CommunicatorPtr& communicator) session2->startUpdate(serial); session2->finishUpdate(); } - catch(const Ice::UserException& ex) + catch(const Ice::UserException&) { test(false); } @@ -543,7 +543,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { ApplicationUpdateDescriptor update; update.name = "Application"; - update.variables.insert(make_pair("test", "test")); + update.variables.insert(make_pair(string("test"), string("test"))); session1->updateApplication(update); regObs1->waitForUpdate(__FILE__, __LINE__); test(regObs1->applications.find("Application") != regObs1->applications.end()); diff --git a/cpp/test/IceGrid/session/icegridsessionC.dsp b/cpp/test/IceGrid/session/icegridsessionC.dsp new file mode 100755 index 00000000000..e4cf6930812 --- /dev/null +++ b/cpp/test/IceGrid/session/icegridsessionC.dsp @@ -0,0 +1,114 @@ +# Microsoft Developer Studio Project File - Name="icegridsessionC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=icegridsessionC - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "icegridsessionC.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 "icegridsessionC.mak" CFG="icegridsessionC - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "icegridsessionC - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "icegridsessionC - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "icegridsessionC - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# SUBTRACT LINK32 /debug /nodefaultlib
+
+!ELSEIF "$(CFG)" == "icegridsessionC - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "icegridsessionC - Win32 Release"
+# Name "icegridsessionC - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\AllTests.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Client.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Test.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/cpp/test/IceGrid/session/icegridsessionS.dsp b/cpp/test/IceGrid/session/icegridsessionS.dsp new file mode 100755 index 00000000000..f9f5f780b8c --- /dev/null +++ b/cpp/test/IceGrid/session/icegridsessionS.dsp @@ -0,0 +1,106 @@ +# Microsoft Developer Studio Project File - Name="icegridsessionS" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=icegridsessionS - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "icegridsessionS.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 "icegridsessionS.mak" CFG="icegridsessionS - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "icegridsessionS - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "icegridsessionS - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "icegridsessionS - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# SUBTRACT LINK32 /debug /nodefaultlib
+
+!ELSEIF "$(CFG)" == "icegridsessionS - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "icegridsessionS - Win32 Release"
+# Name "icegridsessionS - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Server.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/cpp/test/IceGrid/deployer/deployerC.dsp b/cpp/test/IceGrid/simple/icegridsimpleC.dsp index 8e12b74ae16..49ecd69754c 100644 --- a/cpp/test/IceGrid/deployer/deployerC.dsp +++ b/cpp/test/IceGrid/simple/icegridsimpleC.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="deployerC" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="icegridsimpleC" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=deployerC - Win32 Debug
+CFG=icegridsimpleC - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "deployerC.mak".
+!MESSAGE NMAKE /f "icegridsimpleC.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 "deployerC.mak" CFG="deployerC - Win32 Debug"
+!MESSAGE NMAKE /f "icegridsimpleC.mak" CFG="icegridsimpleC - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "deployerC - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "deployerC - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "icegridsimpleC - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "icegridsimpleC - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=deployerC - Win32 Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "deployerC - Win32 Release"
+!IF "$(CFG)" == "icegridsimpleC - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -54,7 +54,7 @@ LINK32=link.exe # ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib"
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "deployerC - Win32 Debug"
+!ELSEIF "$(CFG)" == "icegridsimpleC - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -77,15 +77,15 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
-# SUBTRACT LINK32 /incremental:no /nodefaultlib
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
-# Name "deployerC - Win32 Release"
-# Name "deployerC - Win32 Debug"
+# Name "icegridsimpleC - Win32 Release"
+# Name "icegridsimpleC - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -117,7 +117,7 @@ SOURCE=.\Test.h SOURCE=.\Test.ice
-!IF "$(CFG)" == "deployerC - Win32 Release"
+!IF "$(CFG)" == "icegridsimpleC - Win32 Release"
USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -133,7 +133,7 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "deployerC - Win32 Debug"
+!ELSEIF "$(CFG)" == "icegridsimpleC - Win32 Debug"
USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/test/IceGrid/deployer/deployerS.dsp b/cpp/test/IceGrid/simple/icegridsimpleS.dsp index 5ebdb778707..92caf4a4e11 100644 --- a/cpp/test/IceGrid/deployer/deployerS.dsp +++ b/cpp/test/IceGrid/simple/icegridsimpleS.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="deployerS" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="icegridsimpleS" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=deployerS - Win32 Debug
+CFG=icegridsimpleS - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "deployerS.mak".
+!MESSAGE NMAKE /f "icegridsimpleS.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 "deployerS.mak" CFG="deployerS - Win32 Debug"
+!MESSAGE NMAKE /f "icegridsimpleS.mak" CFG="icegridsimpleS - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "deployerS - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "deployerS - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "icegridsimpleS - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "icegridsimpleS - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=deployerS - Win32 Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "deployerS - Win32 Release"
+!IF "$(CFG)" == "icegridsimpleS - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -54,7 +54,7 @@ LINK32=link.exe # ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib"
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "deployerS - Win32 Debug"
+!ELSEIF "$(CFG)" == "icegridsimpleS - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -77,15 +77,15 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
-# SUBTRACT LINK32 /incremental:no /nodefaultlib
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
-# Name "deployerS - Win32 Release"
-# Name "deployerS - Win32 Debug"
+# Name "icegridsimpleS - Win32 Release"
+# Name "icegridsimpleS - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -121,7 +121,7 @@ SOURCE=.\TestI.h SOURCE=.\Test.ice
-!IF "$(CFG)" == "deployerS - Win32 Release"
+!IF "$(CFG)" == "icegridsimpleS - Win32 Release"
USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -137,7 +137,7 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "deployerS - Win32 Debug"
+!ELSEIF "$(CFG)" == "icegridsimpleS - Win32 Debug"
USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp index b96fb226393..8b3d0155f78 100644 --- a/cpp/test/IceGrid/update/AllTests.cpp +++ b/cpp/test/IceGrid/update/AllTests.cpp @@ -523,7 +523,7 @@ allTests(const Ice::CommunicatorPtr& communicator) admin->updateApplication(update); test(false); } - catch(const DeploymentException& ex) + catch(const DeploymentException&) { // Missing app variable //cerr << ex.reason << endl; @@ -544,7 +544,7 @@ allTests(const Ice::CommunicatorPtr& communicator) admin->updateApplication(update); test(false); } - catch(const DeploymentException& ex) + catch(const DeploymentException&) { // Missing node variable //cerr << ex.reason << endl; @@ -568,7 +568,7 @@ allTests(const Ice::CommunicatorPtr& communicator) admin->updateApplication(update); test(false); } - catch(const DeploymentException& ex) + catch(const DeploymentException&) { // Missing parameter //cerr << ex.reason << endl; diff --git a/cpp/test/IceGrid/update/icegridupdateC.dsp b/cpp/test/IceGrid/update/icegridupdateC.dsp new file mode 100644 index 00000000000..f58610eeb12 --- /dev/null +++ b/cpp/test/IceGrid/update/icegridupdateC.dsp @@ -0,0 +1,157 @@ +# Microsoft Developer Studio Project File - Name="icegridupdateC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=icegridupdateC - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "icegridupdateC.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 "icegridupdateC.mak" CFG="icegridupdateC - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "icegridupdateC - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "icegridupdateC - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "icegridupdateC - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# SUBTRACT LINK32 /debug /nodefaultlib
+
+!ELSEIF "$(CFG)" == "icegridupdateC - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "icegridupdateC - Win32 Release"
+# Name "icegridupdateC - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\AllTests.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Test.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Test.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\Test.ice
+
+!IF "$(CFG)" == "icegridupdateC - Win32 Release"
+
+USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
+# Begin Custom Build
+InputPath=.\Test.ice
+
+BuildCmds= \
+ ..\..\..\bin\slice2cpp.exe Test.ice
+
+"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "icegridupdateC - Win32 Debug"
+
+USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
+# Begin Custom Build
+InputPath=.\Test.ice
+
+BuildCmds= \
+ ..\..\..\bin\slice2cpp.exe Test.ice
+
+"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/cpp/test/IceGrid/update/icegridupdateS.dsp b/cpp/test/IceGrid/update/icegridupdateS.dsp new file mode 100644 index 00000000000..f7f76c0ee56 --- /dev/null +++ b/cpp/test/IceGrid/update/icegridupdateS.dsp @@ -0,0 +1,161 @@ +# Microsoft Developer Studio Project File - Name="icegridupdateS" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=icegridupdateS - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "icegridupdateS.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 "icegridupdateS.mak" CFG="icegridupdateS - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "icegridupdateS - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "icegridupdateS - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "icegridupdateS - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# SUBTRACT LINK32 /debug /nodefaultlib
+
+!ELSEIF "$(CFG)" == "icegridupdateS - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "icegridupdateS - Win32 Release"
+# Name "icegridupdateS - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Server.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Test.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestI.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Test.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestI.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\Test.ice
+
+!IF "$(CFG)" == "icegridupdateS - Win32 Release"
+
+USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
+# Begin Custom Build
+InputPath=.\Test.ice
+
+BuildCmds= \
+ ..\..\..\bin\slice2cpp.exe Test.ice
+
+"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "icegridupdateS - Win32 Debug"
+
+USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
+# Begin Custom Build
+InputPath=.\Test.ice
+
+BuildCmds= \
+ ..\..\..\bin\slice2cpp.exe Test.ice
+
+"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
|