[hydra-commits] kpfleming: branch ice/slice-preserving-translators r603 - in /ice/branches/sl...
SVN commits to the Hydra project
hydra-commits at lists.digium.com
Mon Apr 26 17:26:51 CDT 2010
Author: kpfleming
Date: Mon Apr 26 17:26:51 2010
New Revision: 603
URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=603
Log:
since this is a feature branch, it should not contain the contents of other feature branches unless it relies on them
Modified:
ice/branches/slice-preserving-translators/ (props changed)
ice/branches/slice-preserving-translators/cpp/src/IceBox/ServiceManagerI.cpp (contents, props changed)
ice/branches/slice-preserving-translators/cpp/src/IceBox/ServiceManagerI.h (contents, props changed)
ice/branches/slice-preserving-translators/cs/src/IceBox/ServiceManagerI.cs (contents, props changed)
ice/branches/slice-preserving-translators/java/src/IceBox/ServiceManagerI.java (contents, props changed)
ice/branches/slice-preserving-translators/slice/IceBox/IceBox.ice (contents, props changed)
Propchange: ice/branches/slice-preserving-translators/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 26 17:26:51 2010
@@ -1,2 +1,1 @@
-/ice/branches/icebox-local:149-423
/ice/upstream/3.4.0:509-510
Modified: ice/branches/slice-preserving-translators/cpp/src/IceBox/ServiceManagerI.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-preserving-translators/cpp/src/IceBox/ServiceManagerI.cpp?view=diff&rev=603&r1=602&r2=603
==============================================================================
--- ice/branches/slice-preserving-translators/cpp/src/IceBox/ServiceManagerI.cpp (original)
+++ ice/branches/slice-preserving-translators/cpp/src/IceBox/ServiceManagerI.cpp Mon Apr 26 17:26:51 2010
@@ -134,8 +134,6 @@
{
_argv.push_back(argv[i]);
}
-
- _localServiceManager = new LocalServiceManagerI();
}
IceBox::ServiceManagerI::~ServiceManagerI()
@@ -668,12 +666,6 @@
communicator = info.communicator;
}
- ServiceWithLocalServicesPtr lservice = ServiceWithLocalServicesPtr::dynamicCast(info.service);
- if(lservice)
- {
- lservice->setLocalServiceManager(_localServiceManager);
- }
-
//
// Start the service.
//
@@ -977,30 +969,3 @@
}
return properties;
}
-
-void ServiceManagerI::LocalServiceManagerI::addLocalService(const std::string& name, const Ice::LocalObjectPtr& service)
-{
- IceUtil::Mutex::Lock lock(_lock);
- _dict[name] = service;
-}
-
-void ServiceManagerI::LocalServiceManagerI::removeLocalService(const std::string& name)
-{
- IceUtil::Mutex::Lock lock(_lock);
- _dict.erase(name);
-}
-
-Ice::LocalObjectPtr ServiceManagerI::LocalServiceManagerI::findLocalService(const std::string& name)
-{
- IceUtil::Mutex::Lock lock(_lock);
- map<string, Ice::LocalObjectPtr>::const_iterator search = _dict.find(name);
- if(search == _dict.end())
- {
- return 0;
- }
- else
- {
- return search->second;
- }
-
-}
Propchange: ice/branches/slice-preserving-translators/cpp/src/IceBox/ServiceManagerI.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 26 17:26:51 2010
@@ -1,3 +1,1 @@
-/ice/branches/icebox-local/cpp/src/IceBox/ServiceManagerI.cpp:149-423
-/ice/trunk/cpp/src/IceBox/ServiceManagerI.cpp:57-149
/ice/upstream/3.4.0/cpp/src/IceBox/ServiceManagerI.cpp:509-510
Modified: ice/branches/slice-preserving-translators/cpp/src/IceBox/ServiceManagerI.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-preserving-translators/cpp/src/IceBox/ServiceManagerI.h?view=diff&rev=603&r1=602&r2=603
==============================================================================
--- ice/branches/slice-preserving-translators/cpp/src/IceBox/ServiceManagerI.h (original)
+++ ice/branches/slice-preserving-translators/cpp/src/IceBox/ServiceManagerI.h Mon Apr 26 17:26:51 2010
@@ -21,22 +21,6 @@
class ServiceManagerI : public ServiceManager, public IceUtil::Monitor<IceUtil::Mutex>
{
- class LocalServiceManagerI : public LocalServiceManager
- {
- public:
-
- virtual void addLocalService(const std::string&, const Ice::LocalObjectPtr&);
- virtual void removeLocalService(const std::string&);
- virtual Ice::LocalObjectPtr findLocalService(const std::string&);
-
- private:
-
- IceUtil::Mutex _lock;
- std::map<std::string, Ice::LocalObjectPtr> _dict;
- };
-
- typedef IceUtil::Handle<LocalServiceManagerI> LocalServiceManagerIPtr;
-
public:
ServiceManagerI(Ice::CommunicatorPtr, int&, char*[]);
@@ -97,8 +81,6 @@
std::set<ServiceObserverPrx> _observers;
int _traceServiceObserver;
-
- LocalServiceManagerPtr _localServiceManager;
};
typedef IceUtil::Handle<ServiceManagerI> ServiceManagerIPtr;
Propchange: ice/branches/slice-preserving-translators/cpp/src/IceBox/ServiceManagerI.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 26 17:26:51 2010
@@ -1,3 +1,1 @@
-/ice/branches/icebox-local/cpp/src/IceBox/ServiceManagerI.h:149-423
-/ice/trunk/cpp/src/IceBox/ServiceManagerI.h:57-149
/ice/upstream/3.4.0/cpp/src/IceBox/ServiceManagerI.h:509-510
Modified: ice/branches/slice-preserving-translators/cs/src/IceBox/ServiceManagerI.cs
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-preserving-translators/cs/src/IceBox/ServiceManagerI.cs?view=diff&rev=603&r1=602&r2=603
==============================================================================
--- ice/branches/slice-preserving-translators/cs/src/IceBox/ServiceManagerI.cs (original)
+++ ice/branches/slice-preserving-translators/cs/src/IceBox/ServiceManagerI.cs Mon Apr 26 17:26:51 2010
@@ -22,47 +22,6 @@
//
class ServiceManagerI : ServiceManagerDisp_
{
- class LocalServiceManagerI : LocalServiceManager
- {
- public LocalServiceManagerI()
- {
- _dict = new Dictionary<string, Object>();
- }
-
- public void addLocalService(string name, System.Object service)
- {
- lock(this)
- {
- _dict.Add(name, service);
- }
- }
-
- public void removeLocalService(string name)
- {
- lock(this)
- {
- _dict.Remove(name);
- }
- }
-
- public System.Object findLocalService(string name)
- {
- lock(this)
- {
- if(!_dict.ContainsKey(name))
- {
- return null;
- }
- else
- {
- return _dict[name];
- }
- }
- }
-
- private Dictionary<string, Object> _dict;
- }
-
class AMIServicesStartedCallback : AMI_ServiceObserver_servicesStarted
{
public AMIServicesStartedCallback(ServiceManagerI serviceManager, ServiceObserverPrx observer)
@@ -122,7 +81,7 @@
_logger = _communicator.getLogger();
_argv = args;
_traceServiceObserver = _communicator.getProperties().getPropertyAsInt("IceBox.Trace.ServiceObserver");
- _localServiceManager = new LocalServiceManagerI();
+
}
public override Dictionary<string, string>
@@ -654,16 +613,6 @@
FailureException e = new FailureException(ex);
e.reason = err + "System.Exception";
throw e;
- }
-
- try
- {
- ServiceWithLocalServices lservice = (ServiceWithLocalServices)info.service;
- lservice.setLocalServiceManager(_localServiceManager);
- }
- catch(System.InvalidCastException)
- {
- // Nothing to do here, object does not implement ServiceWithLocalServices
}
//
@@ -1077,7 +1026,6 @@
private bool _pendingStatusChanges = false;
private Dictionary<ServiceObserverPrx, bool> _observers = new Dictionary<ServiceObserverPrx, bool>();
private int _traceServiceObserver = 0;
- private LocalServiceManager _localServiceManager;
}
}
Propchange: ice/branches/slice-preserving-translators/cs/src/IceBox/ServiceManagerI.cs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 26 17:26:51 2010
@@ -1,3 +1,1 @@
-/ice/branches/icebox-local/cs/src/IceBox/ServiceManagerI.cs:149-423
-/ice/trunk/cs/src/IceBox/ServiceManagerI.cs:57-149
/ice/upstream/3.4.0/cs/src/IceBox/ServiceManagerI.cs:509-510
Modified: ice/branches/slice-preserving-translators/java/src/IceBox/ServiceManagerI.java
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-preserving-translators/java/src/IceBox/ServiceManagerI.java?view=diff&rev=603&r1=602&r2=603
==============================================================================
--- ice/branches/slice-preserving-translators/java/src/IceBox/ServiceManagerI.java (original)
+++ ice/branches/slice-preserving-translators/java/src/IceBox/ServiceManagerI.java Mon Apr 26 17:26:51 2010
@@ -22,7 +22,6 @@
_logger = _communicator.getLogger();
_argv = args;
_traceServiceObserver = _communicator.getProperties().getPropertyAsInt("IceBox.Trace.ServiceObserver");
- _localServiceManager = new LocalServiceManagerI();
}
public java.util.Map<String, String>
@@ -516,16 +515,6 @@
throw e;
}
- try
- {
- ServiceWithLocalServices lservice = (ServiceWithLocalServices)info.service;
- lservice.setLocalServiceManager(_localServiceManager);
- }
- catch(ClassCastException ex)
- {
- // Nothing to do here, the object does not implement ServiceWithLocalServices
- }
-
//
// Invoke Service::start().
//
@@ -955,40 +944,6 @@
String className;
}
- static class LocalServiceManagerI implements LocalServiceManager
- {
- public LocalServiceManagerI()
- {
- _dict = new java.util.HashMap<String, Object>();
- }
-
- public void addLocalService(String name, Object service)
- {
- synchronized(this)
- {
- _dict.put(name, service);
- }
- }
-
- public void removeLocalService(String name)
- {
- synchronized(this)
- {
- _dict.remove(name);
- }
- }
-
- public Object findLocalService(String name)
- {
- synchronized(this)
- {
- return _dict.get(name);
- }
- }
-
- private java.util.Map<String, Object> _dict;
- }
-
private Ice.Properties
createServiceProperties(String service)
{
@@ -1022,7 +977,6 @@
private String[] _argv; // Filtered server argument vector
private java.util.List<ServiceInfo> _services = new java.util.LinkedList<ServiceInfo>();
private boolean _pendingStatusChanges = false;
- private LocalServiceManager _localServiceManager;
java.util.HashSet<ServiceObserverPrx> _observers = new java.util.HashSet<ServiceObserverPrx>();
int _traceServiceObserver = 0;
Propchange: ice/branches/slice-preserving-translators/java/src/IceBox/ServiceManagerI.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 26 17:26:51 2010
@@ -1,3 +1,1 @@
-/ice/branches/icebox-local/java/src/IceBox/ServiceManagerI.java:149-423
-/ice/trunk/java/src/IceBox/ServiceManagerI.java:57-149
/ice/upstream/3.4.0/java/src/IceBox/ServiceManagerI.java:509-510
Modified: ice/branches/slice-preserving-translators/slice/IceBox/IceBox.ice
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-preserving-translators/slice/IceBox/IceBox.ice?view=diff&rev=603&r1=602&r2=603
==============================================================================
--- ice/branches/slice-preserving-translators/slice/IceBox/IceBox.ice (original)
+++ ice/branches/slice-preserving-translators/slice/IceBox/IceBox.ice Mon Apr 26 17:26:51 2010
@@ -114,75 +114,6 @@
void stop();
};
-/**
- *
- * IceBox can provide a 'directory' of local services, which are objects
- * provided by application services in the IceBox container that are directly
- * accessible by other application services, without the need of proxies
- * (i.e. as local Ice objects). Any application service wishing to use
- * this facility can derive its service object from [ServiceWithLocalServices]
- * and IceBox will automatically provide a reference the [LocalServiceManager].
- *
- **/
-local interface LocalServiceManager
-{
- /**
- *
- * Register a local service.
- *
- * <p class="Note">If an existing service is in the [LocalServiceManager]
- * with the provided name, it will be replaced.
- *
- * @param name The service's name.
- *
- * @param service A reference to the object providing the service.
- *
- **/
- void addLocalService(string name, LocalObject service);
-
- /**
- *
- * Unregister a local service.
- *
- * <p class="Note">If no existing service is in the [LocalServiceManager]
- * with the provided name, no operation will be performed.
- *
- * @param name The service's name.
- *
- **/
- void removeLocalService(string name);
-
- /**
- *
- * Find a local service.
- *
- * @param name The service's name.
- *
- * @return A reference to the object providing the requested service,
- * or null if no service by that name was found.
- *
- **/
- LocalObject findLocalService(string name);
-};
-
-/**
- *
- * An application service managed by a [ServiceManager] that uses the [LocalServiceManager].
- *
- **/
-local interface ServiceWithLocalServices extends Service
-{
- /**
- *
- * Set the service's [LocalServiceManager] reference. IceBox will
- * call this operation before instantiating the service's object.
- *
- * @param manager The [LocalServiceManager] provided by the IceBox
- * instance.
- *
- **/
- void setLocalServiceManager(LocalServiceManager manager);
-};
/**
*
Propchange: ice/branches/slice-preserving-translators/slice/IceBox/IceBox.ice
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 26 17:26:51 2010
@@ -1,3 +1,1 @@
-/ice/branches/icebox-local/slice/IceBox/IceBox.ice:149-423
-/ice/trunk/slice/IceBox/IceBox.ice:57-149
/ice/upstream/3.4.0/slice/IceBox/IceBox.ice:509-510
More information about the asterisk-scf-commits
mailing list