summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Campo2008-03-10 12:31:07 (EDT)
committerChristian Campo2008-03-10 12:31:07 (EDT)
commit2db4722142e2499f9d6a5a74afb0474999b759f8 (patch)
treea5a56b38a788feccc542f81ce505793e93283e95
parentfd92456a5741219878d06ebbdea356d81a912b59 (diff)
downloadorg.eclipse.riena-2db4722142e2499f9d6a5a74afb0474999b759f8.zip
org.eclipse.riena-2db4722142e2499f9d6a5a74afb0474999b759f8.tar.gz
org.eclipse.riena-2db4722142e2499f9d6a5a74afb0474999b759f8.tar.bz2
added "useRanking()" to several places where the service injector is used
-rw-r--r--org.eclipse.riena.communication.console/src/org/eclipse/riena/internal/communication/console/Activator.java6
-rw-r--r--org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/Activator.java2
-rw-r--r--org.eclipse.riena.security.common/src/org/eclipse/riena/internal/security/common/SecurityCallHook.java2
-rw-r--r--org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authentication/ClientLogin.java4
-rw-r--r--org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/RienaPolicy.java2
-rw-r--r--org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/Sentinel.java4
-rw-r--r--org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/internal/PermissionCache.java2
-rw-r--r--org.eclipse.riena.security.server/src/org/eclipse/riena/internal/security/server/SecurityServiceHook.java6
-rw-r--r--org.eclipse.riena.security.services/src/org/eclipse/riena/internal/security/authenticationservice/AuthenticationService.java6
-rw-r--r--org.eclipse.riena.security.services/src/org/eclipse/riena/internal/security/authorizationservice/AuthorizationService.java2
10 files changed, 18 insertions, 18 deletions
diff --git a/org.eclipse.riena.communication.console/src/org/eclipse/riena/internal/communication/console/Activator.java b/org.eclipse.riena.communication.console/src/org/eclipse/riena/internal/communication/console/Activator.java
index 1d06623..f0f2f41 100644
--- a/org.eclipse.riena.communication.console/src/org/eclipse/riena/internal/communication/console/Activator.java
+++ b/org.eclipse.riena.communication.console/src/org/eclipse/riena/internal/communication/console/Activator.java
@@ -46,9 +46,9 @@ public class Activator implements BundleActivator {
// the filter applies only if the service is living in this container
// e.g. server.
String filter = "(" + RSDPublisherProperties.PROP_IS_REMOTE + "=true)";
- publisherInjector = new ServiceId(IServicePublishEventDispatcher.ID).useFilter(filter).injectInto(console)
- .andStart(context);
- registryInjector = new ServiceId(IRemoteServiceRegistry.ID).injectInto(console).andStart(context);
+ publisherInjector = new ServiceId(IServicePublishEventDispatcher.ID).useRanking().useFilter(filter).injectInto(
+ console).andStart(context);
+ registryInjector = new ServiceId(IRemoteServiceRegistry.ID).useRanking().injectInto(console).andStart(context);
consoleReg = context.registerService(CommandProvider.class.getName(), console, new Hashtable<String, String>());
}
diff --git a/org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/Activator.java b/org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/Activator.java
index 5114549..470d0a1 100644
--- a/org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/Activator.java
+++ b/org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/Activator.java
@@ -47,7 +47,7 @@ public class Activator extends RienaActivator {
logger = getLogger(Activator.class.getName());
dispatcher = new ServicePublishEventDispatcher(context);
- publisherInjector = new ServiceId(IServicePublisher.ID).injectInto(dispatcher).andStart(context);
+ publisherInjector = new ServiceId(IServicePublisher.ID).useRanking().injectInto(dispatcher).andStart(context);
// register as OSGi service, the start will pick up the OSGi service and
// publish it
diff --git a/org.eclipse.riena.security.common/src/org/eclipse/riena/internal/security/common/SecurityCallHook.java b/org.eclipse.riena.security.common/src/org/eclipse/riena/internal/security/common/SecurityCallHook.java
index b6e186f..8bd43ce 100644
--- a/org.eclipse.riena.security.common/src/org/eclipse/riena/internal/security/common/SecurityCallHook.java
+++ b/org.eclipse.riena.security.common/src/org/eclipse/riena/internal/security/common/SecurityCallHook.java
@@ -32,7 +32,7 @@ public class SecurityCallHook implements ICallHook {
public SecurityCallHook() {
super();
- new ServiceId(ISessionHolderService.ID).injectInto(this).andStart(Activator.getContext());
+ new ServiceId(ISessionHolderService.ID).useRanking().injectInto(this).andStart(Activator.getContext());
}
public void bind(ISessionHolderService shService) {
diff --git a/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authentication/ClientLogin.java b/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authentication/ClientLogin.java
index 705eef8..6f509e0 100644
--- a/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authentication/ClientLogin.java
+++ b/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authentication/ClientLogin.java
@@ -37,8 +37,8 @@ public class ClientLogin {
super();
this.loginContext = loginContext;
this.subject = subject;
- new ServiceId(IAuthenticationService.ID).injectInto(this).andStart(Activator.getContext());
- new ServiceId(ISubjectHolderService.ID).injectInto(this).andStart(Activator.getContext());
+ new ServiceId(IAuthenticationService.ID).useRanking().injectInto(this).andStart(Activator.getContext());
+ new ServiceId(ISubjectHolderService.ID).useRanking().injectInto(this).andStart(Activator.getContext());
}
public void bind(IAuthenticationService authenticationService) {
diff --git a/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/RienaPolicy.java b/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/RienaPolicy.java
index 231c695..8168d55 100644
--- a/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/RienaPolicy.java
+++ b/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/RienaPolicy.java
@@ -38,7 +38,7 @@ public class RienaPolicy extends Policy {
public RienaPolicy() {
super();
- new ServiceId(IPermissionCache.ID).injectInto(this).andStart(Activator.getContext());
+ new ServiceId(IPermissionCache.ID).useRanking().injectInto(this).andStart(Activator.getContext());
}
public void bind(IPermissionCache permCache) {
diff --git a/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/Sentinel.java b/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/Sentinel.java
index ce3bc23..9ff2bf1 100644
--- a/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/Sentinel.java
+++ b/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/Sentinel.java
@@ -34,8 +34,8 @@ public class Sentinel {
private Sentinel() {
super();
- new ServiceId(IPermissionCache.ID).injectInto(this).andStart(Activator.getContext());
- new ServiceId(ISubjectHolderService.ID).injectInto(this).andStart(Activator.getContext());
+ new ServiceId(IPermissionCache.ID).useRanking().injectInto(this).andStart(Activator.getContext());
+ new ServiceId(ISubjectHolderService.ID).useRanking().injectInto(this).andStart(Activator.getContext());
}
public void bind(IPermissionCache permCache) {
diff --git a/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/internal/PermissionCache.java b/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/internal/PermissionCache.java
index 629ebc3..76bd930 100644
--- a/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/internal/PermissionCache.java
+++ b/org.eclipse.riena.security.common/src/org/eclipse/riena/security/common/authorization/internal/PermissionCache.java
@@ -48,7 +48,7 @@ public class PermissionCache implements IPermissionCache {
permCache.setMinimumSize(100);
permCache.setTimeout(360000);
}
- new ServiceId(IAuthorizationService.ID).injectInto(this).andStart(Activator.getContext());
+ new ServiceId(IAuthorizationService.ID).useRanking().injectInto(this).andStart(Activator.getContext());
}
public void bind(IAuthorizationService authService) {
diff --git a/org.eclipse.riena.security.server/src/org/eclipse/riena/internal/security/server/SecurityServiceHook.java b/org.eclipse.riena.security.server/src/org/eclipse/riena/internal/security/server/SecurityServiceHook.java
index cb8a7d4..28c2c9e 100644
--- a/org.eclipse.riena.security.server/src/org/eclipse/riena/internal/security/server/SecurityServiceHook.java
+++ b/org.eclipse.riena.security.server/src/org/eclipse/riena/internal/security/server/SecurityServiceHook.java
@@ -70,9 +70,9 @@ public class SecurityServiceHook implements IServiceHook {
super();
new ServiceId(IGenericObjectCache.ID).useFilter("(cache.type=PrincipalCache)").injectInto(this).andStart(
Activator.getContext());
- new ServiceId(ISessionService.ID).injectInto(this).andStart(Activator.getContext());
- new ServiceId(ISubjectHolderService.ID).injectInto(this).andStart(Activator.getContext());
- new ServiceId(ISessionHolderService.ID).injectInto(this).andStart(Activator.getContext());
+ new ServiceId(ISessionService.ID).useRanking().injectInto(this).andStart(Activator.getContext());
+ new ServiceId(ISubjectHolderService.ID).useRanking().injectInto(this).andStart(Activator.getContext());
+ new ServiceId(ISessionHolderService.ID).useRanking().injectInto(this).andStart(Activator.getContext());
// List<UnsecureWebservice> tempList =
// RegistryAccessor.fetchRegistry().getConfiguration(UNSECURE_WEBSERVICES_ID);
diff --git a/org.eclipse.riena.security.services/src/org/eclipse/riena/internal/security/authenticationservice/AuthenticationService.java b/org.eclipse.riena.security.services/src/org/eclipse/riena/internal/security/authenticationservice/AuthenticationService.java
index aafbae0..eb23153 100644
--- a/org.eclipse.riena.security.services/src/org/eclipse/riena/internal/security/authenticationservice/AuthenticationService.java
+++ b/org.eclipse.riena.security.services/src/org/eclipse/riena/internal/security/authenticationservice/AuthenticationService.java
@@ -72,11 +72,11 @@ public class AuthenticationService implements IAuthenticationService {
*/
public AuthenticationService() {
super();
- new ServiceId(ISessionService.ID).injectInto(this).andStart(Activator.getContext());
- new ServiceId(ISubjectHolderService.ID).injectInto(this).andStart(Activator.getContext());
+ new ServiceId(ISessionService.ID).useRanking().injectInto(this).andStart(Activator.getContext());
+ new ServiceId(ISubjectHolderService.ID).useRanking().injectInto(this).andStart(Activator.getContext());
// new
// ServiceId(IAuthenticationModule.ID).injectInto(this).start(Activator.getContext());
- new ServiceId(ISessionHolderService.ID).injectInto(this).andStart(Activator.getContext());
+ new ServiceId(ISessionHolderService.ID).useRanking().injectInto(this).andStart(Activator.getContext());
}
public void bind(ISessionService sessionService) {
diff --git a/org.eclipse.riena.security.services/src/org/eclipse/riena/internal/security/authorizationservice/AuthorizationService.java b/org.eclipse.riena.security.services/src/org/eclipse/riena/internal/security/authorizationservice/AuthorizationService.java
index f275328..1d75054 100644
--- a/org.eclipse.riena.security.services/src/org/eclipse/riena/internal/security/authorizationservice/AuthorizationService.java
+++ b/org.eclipse.riena.security.services/src/org/eclipse/riena/internal/security/authorizationservice/AuthorizationService.java
@@ -24,7 +24,7 @@ public class AuthorizationService implements IAuthorizationService {
public AuthorizationService() {
super();
- new ServiceId(IPermissionStore.ID).injectInto(this).andStart(Activator.getContext());
+ new ServiceId(IPermissionStore.ID).useRanking().injectInto(this).andStart(Activator.getContext());
}
public void bind(IPermissionStore permStore) {