Author: [email protected]
Date: Wed Oct 26 16:13:10 2011
New Revision: 1665
Log:
AMDATU-435 Processing codereview / Removed empty service interface
Removed:
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/WinkRegistrationService.java
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/service/WinkRegistrationServiceImpl.java
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
Wed Oct 26 16:13:10 2011
@@ -15,14 +15,14 @@
*/
package org.amdatu.web.rest.wink.osgi;
-import org.amdatu.web.dispatcher.DispatcherService;
-import org.amdatu.web.rest.wink.WinkRegistrationService;
-import org.amdatu.web.rest.wink.service.WinkRegistrationServiceImpl;
-import org.apache.felix.dm.DependencyActivatorBase;
-import org.apache.felix.dm.DependencyManager;
-import org.osgi.framework.BundleContext;
+import org.amdatu.web.dispatcher.DispatcherService;
+import org.amdatu.web.rest.wink.service.WinkRegistrationServiceImpl;
+import org.apache.felix.dm.Component;
+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;
+import org.osgi.service.log.LogService;
/**
@@ -35,8 +35,8 @@
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
- manager.add(createComponent()
- .setInterface(WinkRegistrationService.class.getName(), null)
+ manager.add(createComponent()
+ .setAutoConfig(Component.class, Boolean.FALSE)
.setImplementation(WinkRegistrationServiceImpl.class)
.add(createServiceDependency()
.setService(DispatcherService.class)
Modified:
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRegistrationServiceImpl.java
==============================================================================
---
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRegistrationServiceImpl.java
Wed Oct 26 16:13:10 2011
@@ -15,29 +15,28 @@
*/
package org.amdatu.web.rest.wink.service;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.servlet.Servlet;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.Variant.VariantListBuilder;
-import javax.ws.rs.ext.RuntimeDelegate;
-
-import org.amdatu.core.tenant.Tenant;
-import org.amdatu.web.dispatcher.DispatcherService;
-import org.amdatu.web.httpcontext.HttpContextManagerService;
-import org.amdatu.web.rest.jaxrs.JaxRsSpi;
-import org.amdatu.web.rest.wink.WinkRegistrationService;
-import org.amdatu.web.rest.wink.osgi.Activator;
-import org.apache.felix.dm.Component;
-import org.apache.felix.dm.DependencyManager;
-import org.apache.wink.common.internal.runtime.RuntimeDelegateImpl;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogService;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.servlet.Servlet;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.Variant.VariantListBuilder;
+import javax.ws.rs.ext.RuntimeDelegate;
+
+import org.amdatu.core.tenant.Tenant;
+import org.amdatu.web.dispatcher.DispatcherService;
+import org.amdatu.web.httpcontext.HttpContextManagerService;
+import org.amdatu.web.rest.jaxrs.JaxRsSpi;
+import org.amdatu.web.rest.wink.osgi.Activator;
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.wink.common.internal.runtime.RuntimeDelegateImpl;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
/**
* This class is responsible for booting Wink as well as publication of new
REST
@@ -45,7 +44,7 @@
* its interfaces will be published as a REST servlet. The servlet alias is
* determined by adding the resource Path value to the REST base path.
*/
-public class WinkRegistrationServiceImpl implements WinkRegistrationService {
+public final class WinkRegistrationServiceImpl {
// Location of application properties in this bundle
private final static String APP_RPOPS = "/conf/application.properties";
@@ -58,11 +57,10 @@
private volatile DependencyManager m_dependencyManager;
private volatile LogService m_logService;
- // Array to prevent dependencyManager from injecting the wrong component
- private Component[] m_spiComponent;
+ // Autoconf disabled in activator
+ private Component m_spiComponent;
public synchronized void init() {
- m_servletComponents.clear();
setRuntimeDelegate();
registerSpiService();
m_logService.log(LogService.LOG_INFO, getClass().getName() + " service
initialized");
@@ -146,11 +144,11 @@
.setImplementation(new JaxRsSpi() {
});
m_dependencyManager.add(comp);
- m_spiComponent = new Component[] { comp };
+ m_spiComponent = comp;
}
private void removeSpiService() {
- m_dependencyManager.remove(m_spiComponent[0]);
+ m_dependencyManager.remove(m_spiComponent);
}
/**
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
