Commit b6b9a40e authored by Misagh Moayyed's avatar Misagh Moayyed
Browse files

fixed merge

parent c3eb4670
...@@ -59,10 +59,6 @@ public final class DefaultServicesManagerImpl implements ReloadableServicesManag ...@@ -59,10 +59,6 @@ public final class DefaultServicesManagerImpl implements ReloadableServicesManag
load(); load();
} }
* @deprecated As of 4.1. Use {@link #DefaultServicesManagerImpl(ServiceRegistryDao)}
* instead. The <code>defaultAttributes</code> parameter is no longer used. Attributes are configured
* per service definition in the services registry. See {@link RegisteredService#getAttributeReleasePolicy()}
* for more details.
@Audit(action = "DELETE_SERVICE", actionResolverName = "DELETE_SERVICE_ACTION_RESOLVER", @Audit(action = "DELETE_SERVICE", actionResolverName = "DELETE_SERVICE_ACTION_RESOLVER",
resourceResolverName = "DELETE_SERVICE_RESOURCE_RESOLVER") resourceResolverName = "DELETE_SERVICE_RESOURCE_RESOLVER")
@Override @Override
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment