summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Liebig2008-02-20 08:42:16 (EST)
committerStefan Liebig2008-02-20 08:42:16 (EST)
commit19995a2d3277c3f18e63476bf2f1d6ad000b8128 (patch)
tree42d8ea5aa640f77fe499998dee64d27ede1bcc0b
parent7ef3478695368779f624304a21565672f9cdefa9 (diff)
downloadorg.eclipse.riena-19995a2d3277c3f18e63476bf2f1d6ad000b8128.zip
org.eclipse.riena-19995a2d3277c3f18e63476bf2f1d6ad000b8128.tar.gz
org.eclipse.riena-19995a2d3277c3f18e63476bf2f1d6ad000b8128.tar.bz2
refactored service injector
-rw-r--r--org.eclipse.riena.communication.console/src/org/eclipse/riena/internal/communication/console/Activator.java4
-rw-r--r--org.eclipse.riena.communication.core/src/org/eclipse/riena/internal/communication/core/factory/CallHooksProxy.java2
-rw-r--r--org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/Activator.java2
-rw-r--r--org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/ServiceHooksProxy.java2
-rw-r--r--org.eclipse.riena.core/src/org/eclipse/riena/core/logging/LogUtil.java4
-rw-r--r--org.eclipse.riena.core/src/org/eclipse/riena/internal/core/config/ConfigFromExtensions.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.java8
12 files changed, 19 insertions, 19 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 f027c7a..023b3a7 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
@@ -47,8 +47,8 @@ public class Activator implements BundleActivator {
// e.g. server.
String filter = "(" + RSDPublisherProperties.PROP_IS_REMOTE + "=true)";
publisherInjector = new ServiceId(IServicePublishEventDispatcher.ID).useFilter(filter).injectInto(console)
- .start(context);
- registryInjector = new ServiceId(IRemoteServiceRegistry.ID).injectInto(console).start(context);
+ .andStart(context);
+ registryInjector = new ServiceId(IRemoteServiceRegistry.ID).injectInto(console).andStart(context);
consoleReg = context.registerService(CommandProvider.class.getName(), console, new Hashtable<String, String>());
}
diff --git a/org.eclipse.riena.communication.core/src/org/eclipse/riena/internal/communication/core/factory/CallHooksProxy.java b/org.eclipse.riena.communication.core/src/org/eclipse/riena/internal/communication/core/factory/CallHooksProxy.java
index 0d56615..392077a 100644
--- a/org.eclipse.riena.communication.core/src/org/eclipse/riena/internal/communication/core/factory/CallHooksProxy.java
+++ b/org.eclipse.riena.communication.core/src/org/eclipse/riena/internal/communication/core/factory/CallHooksProxy.java
@@ -33,7 +33,7 @@ public class CallHooksProxy extends AbstractHooksProxy {
public CallHooksProxy(Object proxiedInstance) {
super(proxiedInstance);
- new ServiceId(ICallHook.ID).injectInto(this).start(Activator.getContext());
+ new ServiceId(ICallHook.ID).injectInto(this).andStart(Activator.getContext());
}
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
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 06e43b8..1d6c507 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
@@ -43,7 +43,7 @@ public class Activator implements BundleActivator {
Activator.context = context;
dispatcher = new ServicePublishEventDispatcher(context);
- publisherInjector = new ServiceId(IServicePublisher.ID).injectInto(dispatcher).start(context);
+ publisherInjector = new ServiceId(IServicePublisher.ID).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.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/ServiceHooksProxy.java b/org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/ServiceHooksProxy.java
index c33b387..0b66ec5 100644
--- a/org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/ServiceHooksProxy.java
+++ b/org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/ServiceHooksProxy.java
@@ -34,7 +34,7 @@ public class ServiceHooksProxy extends AbstractHooksProxy implements InvocationH
public ServiceHooksProxy(Object serviceInstance) {
super(serviceInstance);
- new ServiceId(IServiceHook.ID).injectInto(this).start(Activator.getContext());
+ new ServiceId(IServiceHook.ID).injectInto(this).andStart(Activator.getContext());
}
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
diff --git a/org.eclipse.riena.core/src/org/eclipse/riena/core/logging/LogUtil.java b/org.eclipse.riena.core/src/org/eclipse/riena/core/logging/LogUtil.java
index 75789fd..38011ea 100644
--- a/org.eclipse.riena.core/src/org/eclipse/riena/core/logging/LogUtil.java
+++ b/org.eclipse.riena.core/src/org/eclipse/riena/core/logging/LogUtil.java
@@ -86,7 +86,7 @@ public class LogUtil {
* initialize LogUtil
*/
public void init() {
- new ServiceId(ExtendedLogService.class.getName()).useRanking().injectInto(this).start(context);
- new ServiceId(ExtendedLogReaderService.class.getName()).useRanking().injectInto(this).start(context);
+ new ServiceId(ExtendedLogService.class.getName()).useRanking().injectInto(this).andStart(context);
+ new ServiceId(ExtendedLogReaderService.class.getName()).useRanking().injectInto(this).andStart(context);
}
}
diff --git a/org.eclipse.riena.core/src/org/eclipse/riena/internal/core/config/ConfigFromExtensions.java b/org.eclipse.riena.core/src/org/eclipse/riena/internal/core/config/ConfigFromExtensions.java
index c60764e..b4d2605 100644
--- a/org.eclipse.riena.core/src/org/eclipse/riena/internal/core/config/ConfigFromExtensions.java
+++ b/org.eclipse.riena.core/src/org/eclipse/riena/internal/core/config/ConfigFromExtensions.java
@@ -40,6 +40,6 @@ public class ConfigFromExtensions {
* described in the classes javadoc.
*/
public void doConfig() {
- new ServiceId(ConfigurationAdmin.class.getName()).injectInto(new ConfigAdminHandler(context)).start(context);
+ new ServiceId(ConfigurationAdmin.class.getName()).injectInto(new ConfigAdminHandler(context)).andStart(context);
}
} \ No newline at end of file
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 5933442..b6e186f 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).start(Activator.getContext());
+ new ServiceId(ISessionHolderService.ID).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 0da4bff..3f23547 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).start(Activator.getContext());
- new ServiceId(ISubjectHolderService.ID).injectInto(this).start(Activator.getContext());
+ new ServiceId(IAuthenticationService.ID).injectInto(this).andStart(Activator.getContext());
+ new ServiceId(ISubjectHolderService.ID).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 bacdb29..231c695 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).start(Activator.getContext());
+ new ServiceId(IPermissionCache.ID).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 11a43d8..ce3bc23 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).start(Activator.getContext());
- new ServiceId(ISubjectHolderService.ID).injectInto(this).start(Activator.getContext());
+ new ServiceId(IPermissionCache.ID).injectInto(this).andStart(Activator.getContext());
+ new ServiceId(ISubjectHolderService.ID).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 caad04d..629ebc3 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).start(Activator.getContext());
+ new ServiceId(IAuthorizationService.ID).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 46f30a6..8273226 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
@@ -68,11 +68,11 @@ public class SecurityServiceHook implements IServiceHook {
*/
public SecurityServiceHook() {
super();
- new ServiceId(IGenericObjectCache.ID).useFilter("(cache.type=PrincipalCache)").injectInto(this).start(
+ new ServiceId(IGenericObjectCache.ID).useFilter("(cache.type=PrincipalCache)").injectInto(this).andStart(
Activator.getContext());
- new ServiceId(ISessionService.ID).injectInto(this).start(Activator.getContext());
- new ServiceId(ISubjectHolderService.ID).injectInto(this).start(Activator.getContext());
- new ServiceId(ISessionHolderService.ID).injectInto(this).start(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());
// List<UnsecureWebservice> tempList =
// RegistryAccessor.fetchRegistry().getConfiguration(UNSECURE_WEBSERVICES_ID);