Author: [email protected]
Date: Tue Sep 20 14:58:45 2011
New Revision: 1401
Log:
AMDATU-417 LogService is now optional everywhere, some other small changes,
some formatting.
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/osgi/DispatcherServiceActivator.java
trunk/amdatu-web/resource/src/main/java/org/amdatu/web/resource/osgi/Activator.java
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/osgi/Activator.java
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/osgi/HostnameTenantResolverActivator.java
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/osgi/ParameterTenantResolverActivator.java
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/osgi/DispatcherServiceActivator.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/osgi/DispatcherServiceActivator.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/osgi/DispatcherServiceActivator.java
Tue Sep 20 14:58:45 2011
@@ -15,9 +15,6 @@
*/
package org.amdatu.web.dispatcher.osgi;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
import javax.servlet.Filter;
import javax.servlet.Servlet;
@@ -35,14 +32,12 @@
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
-
- Dictionary<String, Object> serviceProperties = new Hashtable<String,
Object>();
manager.add(
createComponent()
- .setInterface(DispatcherService.class.getName(),
serviceProperties)
+ .setInterface(DispatcherService.class.getName(), null)
.setImplementation(DispatcherServiceImpl.class)
.add(createServiceDependency().setService(ExtHttpService.class).setRequired(true))
-
.add(createServiceDependency().setService(LogService.class).setRequired(true))
+
.add(createServiceDependency().setService(LogService.class).setRequired(false))
.add(
createServiceDependency()
.setService(DispatchExtenderFilter.class)
Modified:
trunk/amdatu-web/resource/src/main/java/org/amdatu/web/resource/osgi/Activator.java
==============================================================================
---
trunk/amdatu-web/resource/src/main/java/org/amdatu/web/resource/osgi/Activator.java
(original)
+++
trunk/amdatu-web/resource/src/main/java/org/amdatu/web/resource/osgi/Activator.java
Tue Sep 20 14:58:45 2011
@@ -34,10 +34,14 @@
createComponent()
.setInterface(ResourceSupport.class.getName(), null)
.setImplementation(ResourceProviderListener.class)
-
.add(createServiceDependency().setService(ResourceProvider.class)
+ .add(createServiceDependency()
+ .setService(ResourceProvider.class)
.setRequired(false)
.setCallbacks("resourceProviderAdded",
"resourceProviderRemoved"))
-
.add(createServiceDependency().setService(LogService.class).setRequired(false)));
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
}
@Override
Modified:
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/osgi/Activator.java
==============================================================================
---
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/osgi/Activator.java
(original)
+++
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/osgi/Activator.java
Tue Sep 20 14:58:45 2011
@@ -21,7 +21,9 @@
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.service.log.LogService;
+
/**
* This is the OSGi activator for the Amdatu REST framework based on Apache
Wink.
@@ -33,13 +35,20 @@
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
-
manager.add(createComponent()
.setInterface(WinkRegistrationService.class.getName(), null)
.setImplementation(WinkRegistrationServiceImpl.class)
-
.add(createServiceDependency().setService(DispatcherService.class).setRequired(true))
-
.add(createServiceDependency().setService("(objectclass=*)").setCallbacks("onAdded",
"onRemoved"))
-
.add(createServiceDependency().setService(LogService.class).setRequired(false)));
+ .add(createServiceDependency()
+ .setService(DispatcherService.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService("(" + Constants.OBJECTCLASS + "=*)")
+ .setCallbacks("onAdded", "onRemoved")
+ .setRequired(false))
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
}
@Override
Modified:
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/osgi/HostnameTenantResolverActivator.java
==============================================================================
---
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/osgi/HostnameTenantResolverActivator.java
(original)
+++
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/osgi/HostnameTenantResolverActivator.java
Tue Sep 20 14:58:45 2011
@@ -33,17 +33,24 @@
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
- Dictionary<String, Object> thProperties = new Hashtable<String,
Object>();
- thProperties.put(Constants.SERVICE_RANKING, 1000);
- thProperties.put(DispatcherService.PATTERN_KEY, ".*");
+ Dictionary<String, Object> properties = new Hashtable<String,
Object>();
+ properties.put(Constants.SERVICE_RANKING, 1000);
+ properties.put(DispatcherService.PATTERN_KEY, ".*");
manager.add(
createComponent()
- .setInterface(DispatchExtenderFilter.class.getName(), thProperties)
+ .setInterface(DispatchExtenderFilter.class.getName(), properties)
.setImplementation(HostnameTenantResolverExtenderFilter.class)
// Guards filter lifecycle
-
.add(createServiceDependency().setService(DispatcherService.class).setRequired(true))
-
.add(createServiceDependency().setService(TenantManagementService.class).setRequired(true))
-
.add(createServiceDependency().setService(LogService.class).setRequired(true)));
+ .add(createServiceDependency()
+ .setService(DispatcherService.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService(TenantManagementService.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
}
@Override
Modified:
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/osgi/ParameterTenantResolverActivator.java
==============================================================================
---
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/osgi/ParameterTenantResolverActivator.java
(original)
+++
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/osgi/ParameterTenantResolverActivator.java
Tue Sep 20 14:58:45 2011
@@ -41,9 +41,16 @@
.setInterface(DispatchExtenderFilter.class.getName(),
thProperties)
.setImplementation(ParameterTenantResolverExtenderFilter.class)
// Guards filter lifecycle
-
.add(createServiceDependency().setService(DispatcherService.class).setRequired(true))
-
.add(createServiceDependency().setService(TenantManagementService.class).setRequired(true))
-
.add(createServiceDependency().setService(LogService.class).setRequired(true)));
+ .add(createServiceDependency()
+ .setService(DispatcherService.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService(TenantManagementService.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
}
@Override
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
