Author: ivol37 at gmail.com
Date: Fri Jan 21 15:50:53 2011
New Revision: 683
Log:
[AMDATU-267] Changed "service.ranking" to Constants.SERVICE_RANKING
Modified:
trunk/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/osgi/Activator.java
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRegistrationServiceImpl.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
Modified:
trunk/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/osgi/Activator.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/osgi/Activator.java
(original)
+++
trunk/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/osgi/Activator.java
Fri Jan 21 15:50:53 2011
@@ -32,6 +32,7 @@
import org.ops4j.pax.useradmin.service.UserAdminConstants;
import org.ops4j.pax.useradmin.service.spi.StorageProvider;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.service.http.HttpService;
import org.osgi.service.log.LogService;
@@ -47,8 +48,8 @@
public void init(BundleContext context, DependencyManager manager) throws
Exception {
// First define a service that provides the Role ColumnFamily we need
manager.add(createComponent()
- .setInterface(new
String[]{ColumnFamilyProvider.class.getName()}, null)
- .setImplementation(RoleColumnFamilyProvider.class));
+ .setInterface(new String[]{ColumnFamilyProvider.class.getName()},
null)
+ .setImplementation(RoleColumnFamilyProvider.class));
// This filter is used to define a service dependency on the
ColumnFamilyAvailable service
// for the Role ColumnFamily. As a result, our service will depend on
the availability
@@ -56,28 +57,28 @@
String roleFilter = "(" + ColumnFamilyAvailable.FILTER_NAME + "=" +
CassandraStorageProvider.CF_ROLE + ")";
String keyspaceFilter =
"(" + CassandraPersistenceManager.KEYSPACE_AWARE_KEY + "="
- + CassandraPersistenceManager.DEFAULT_KEYSPACE + ")";
+ + CassandraPersistenceManager.DEFAULT_KEYSPACE + ")";
roleFilter = "(&" + roleFilter + keyspaceFilter + ")";
// Create and register the CassandraStorageProvider service.
Hashtable<String, Object> properties = new Hashtable<String, Object>();
properties.put(UserAdminConstants.STORAGEPROVIDER_TYPE, "Cassandra");
- properties.put("service.ranking", 10);
+ properties.put(Constants.SERVICE_RANKING, 10);
manager.add(createComponent()
- .setInterface(new String[]{StorageProvider.class.getName()},
properties)
- .setImplementation(CassandraStorageProvider.class)
-
.add(createServiceDependency().setService(LogService.class).setRequired(true))
-
.add(createServiceDependency().setService(CassandraPersistenceManager.class,
keyspaceFilter).setRequired(true))
-
.add(createServiceDependency().setService(ColumnFamilyAvailable.class,
roleFilter).setRequired(true))
-
.add(createServiceDependency().setService(CassandraDaemonService.class).setRequired(true)));
+ .setInterface(new String[]{StorageProvider.class.getName()},
properties)
+ .setImplementation(CassandraStorageProvider.class)
+
.add(createServiceDependency().setService(LogService.class).setRequired(true))
+
.add(createServiceDependency().setService(CassandraPersistenceManager.class,
keyspaceFilter).setRequired(true))
+
.add(createServiceDependency().setService(ColumnFamilyAvailable.class,
roleFilter).setRequired(true))
+
.add(createServiceDependency().setService(CassandraDaemonService.class).setRequired(true)));
// Create and register the http context registration service
manager.add(createComponent()
- .setInterface(ResourceProvider.class.getName(), null)
- .setImplementation(HttpContextRegistrationServiceImpl.class)
-
.add(createServiceDependency().setService(LogService.class).setRequired(true))
-
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
-
.add(createServiceDependency().setService(HttpService.class).setRequired(true)));
+ .setInterface(ResourceProvider.class.getName(), null)
+ .setImplementation(HttpContextRegistrationServiceImpl.class)
+
.add(createServiceDependency().setService(LogService.class).setRequired(true))
+
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
+
.add(createServiceDependency().setService(HttpService.class).setRequired(true)));
}
@Override
Modified:
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
==============================================================================
---
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
(original)
+++
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
Fri Jan 21 15:50:53 2011
@@ -26,6 +26,7 @@
import org.ops4j.pax.useradmin.service.UserAdminConstants;
import org.ops4j.pax.useradmin.service.spi.StorageProvider;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.service.log.LogService;
/**
@@ -38,13 +39,13 @@
public void init(BundleContext context, DependencyManager manager) throws
Exception {
Dictionary<String, Object> properties = new Hashtable<String,
Object>();
properties.put(UserAdminConstants.STORAGEPROVIDER_TYPE, "FS");
- properties.put("service.ranking", 0);
+ properties.put(Constants.SERVICE_RANKING, 0);
manager.add(
- createComponent()
- .setImplementation(new FSUserAdminStorageProvider())
- .setInterface(StorageProvider.class.getName(), properties)
-
.add(createConfigurationDependency().setPid(FSUserAdminStorageProvider.CONFIGURATION_PID))
-
.add(createServiceDependency().setService(LogService.class).setRequired(false)));
+ createComponent()
+ .setImplementation(new FSUserAdminStorageProvider())
+ .setInterface(StorageProvider.class.getName(), properties)
+
.add(createConfigurationDependency().setPid(FSUserAdminStorageProvider.CONFIGURATION_PID))
+
.add(createServiceDependency().setService(LogService.class).setRequired(false)));
}
@Override
Modified:
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
Fri Jan 21 15:50:53 2011
@@ -23,7 +23,11 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Properties;
import javax.servlet.Filter;
import javax.servlet.Servlet;
@@ -45,6 +49,7 @@
import org.apache.shindig.protocol.DataServiceServlet;
import org.apache.shindig.protocol.JsonRpcServlet;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.service.http.HttpContext;
import org.osgi.service.http.HttpService;
import org.osgi.service.log.LogService;
@@ -184,8 +189,8 @@
servletProperties.put("contextId", getResourceId());
Component servletComponent = m_dependencyManager.createComponent()
- .setImplementation(m_guiceInjectorService)
- .setInterface(Servlet.class.getName(), servletProperties);
+ .setImplementation(m_guiceInjectorService)
+ .setInterface(Servlet.class.getName(), servletProperties);
m_dependencyManager.add(servletComponent);
m_registeredServletComponents.add(servletComponent);
}
@@ -200,7 +205,7 @@
+ GADGETS_RPC_BASE + baseMatch + ")";
Dictionary<String, Object> properties = new Hashtable<String,
Object>();
properties.put("pattern", regex);
- properties.put("service.ranking", 0);
+ properties.put(Constants.SERVICE_RANKING, 0);
properties.put("contextId", this.getResourceId());
Component component = m_dependencyManager.createComponent();
component.setImplementation(AuthenticationServletFilter.class);
@@ -291,11 +296,11 @@
properties.put("contextId", getResourceId());
Component servletComponent = m_dependencyManager.createComponent()
- .setImplementation(servlet)
- .setInterface(Servlet.class.getName(), properties)
- .add(m_dependencyManager.createServiceDependency()
- .setService(GuiceInjectorServlet.class)
- .setRequired(true));
+ .setImplementation(servlet)
+ .setInterface(Servlet.class.getName(), properties)
+ .add(m_dependencyManager.createServiceDependency()
+ .setService(GuiceInjectorServlet.class)
+ .setRequired(true));
m_dependencyManager.add(servletComponent);
m_registeredServletComponents.add(servletComponent);
}
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
Fri Jan 21 15:50:53 2011
@@ -41,6 +41,7 @@
import org.apache.wink.common.internal.runtime.RuntimeDelegateImpl;
import org.apache.wink.server.utils.RegistrationUtils;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.http.HttpContext;
import org.osgi.service.http.HttpService;
@@ -49,7 +50,7 @@
/**
* This class is responsible for booting Wink as well as registration of
dynamic resources.
- *
+ *
* @author ivol
*/
public class WinkRegistrationServiceImpl implements ResourceProvider {
@@ -176,7 +177,7 @@
/**
* Registers a new REST servlet for this resource.
- *
+ *
* @param service The REST resource service to register the servlet for
*/
private void addRestServlet(Object service) {
@@ -240,7 +241,7 @@
Dictionary<String, Object> filterProperties = new Hashtable<String,
Object>();
// Map filter on /rest/path OR /rest/path?... OR /rest/path/...
filterProperties.put("pattern", alias + "(|\\?.*|/.*)");
- filterProperties.put("service.ranking", 0);
+ filterProperties.put(Constants.SERVICE_RANKING, 0);
filterProperties.put("contextId", alias);
m_dependencyManager.add(m_dependencyManager.createComponent()
.setImplementation(filter)
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
Fri Jan 21 15:50:53 2011
@@ -54,6 +54,7 @@
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.http.HttpService;
import org.osgi.service.log.LogService;
@@ -105,11 +106,11 @@
Dictionary<String, Object> filterProperties = new Hashtable<String,
Object>();
filterProperties.put("pattern", ".*");
filterProperties.put("contextId", SERVLET_ALIAS);
- filterProperties.put("service.ranking", 0);
+ filterProperties.put(Constants.SERVICE_RANKING, 0);
Component filterComponent = manager.createComponent()
- .setImplementation(new TestFilter())
- .setInterface(new String[] {Filter.class.getName(),
TestFilterInterface.class.getName()},
- filterProperties);
+ .setImplementation(new TestFilter())
+ .setInterface(new String[] {Filter.class.getName(),
TestFilterInterface.class.getName()},
+ filterProperties);
// Now we register a test servlet, also whiteboard-style
m_testServlet = new TestServlet();
@@ -117,32 +118,32 @@
servletProperties.put("alias", SERVLET_ALIAS);
servletProperties.put("contextId", SERVLET_ALIAS);
Component servletComponent = manager.createComponent()
- .setImplementation(m_testServlet)
- .setInterface(
- new String[] { Servlet.class.getName(),
TestServletInterface.class.getName(), ResourceProvider.class.getName() },
- servletProperties);
+ .setImplementation(m_testServlet)
+ .setInterface(
+ new String[] { Servlet.class.getName(),
TestServletInterface.class.getName(), ResourceProvider.class.getName() },
+ servletProperties);
Component testComponent = manager.createComponent()
- .setImplementation(this)
-
.add(manager.createServiceDependency().setService(TestFilterInterface.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(TestServletInterface.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(LogService.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(ConfigurationAdmin.class))
-
.add(manager.createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(HttpService.class).setRequired(true));
+ .setImplementation(this)
+
.add(manager.createServiceDependency().setService(TestFilterInterface.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(TestServletInterface.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(LogService.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(ConfigurationAdmin.class))
+
.add(manager.createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(HttpService.class).setRequired(true));
return new Component[] { filterComponent, servletComponent,
testComponent };
}
@Before
public void initConfig() throws IOException, BundleException {
- m_configAdmin = getService(ConfigurationAdmin.class);
- m_logService = getService(LogService.class);
+ m_configAdmin = getService(ConfigurationAdmin.class);
+ m_logService = getService(LogService.class);
- // Add cassandra and templates configs
- ConfigProvider configProvider = new ConfigProvider();
- configProvider.addFelixHttpServiceConfig(m_configAdmin);
- m_logService.log(LogService.LOG_DEBUG, "HttpService config set to " +
ConfigProvider.HOSTNAME + ":" + ConfigProvider.PORTNR);
+ // Add cassandra and templates configs
+ ConfigProvider configProvider = new ConfigProvider();
+ configProvider.addFelixHttpServiceConfig(m_configAdmin);
+ m_logService.log(LogService.LOG_DEBUG, "HttpService config set to " +
ConfigProvider.HOSTNAME + ":" + ConfigProvider.PORTNR);
}
@After
@@ -151,19 +152,19 @@
}
private void initialize() throws Exception {
- m_baseUrl = "http://"; + ConfigProvider.HOSTNAME + ":" +
ConfigProvider.PORTNR;
+ m_baseUrl = "http://"; + ConfigProvider.HOSTNAME + ":" +
ConfigProvider.PORTNR;
- // Initialize the HTTP Context in which the filter, servlet and JSP
under test are registered
+ // Initialize the HTTP Context in which the filter, servlet and JSP
under test are registered
m_httpContextComponent =
m_httpContextFactoryService.create(m_bundleContext, m_testServlet);
}
@Test
public void testFilter() throws Exception {
- initialize();
+ initialize();
- // Wait until the test servlet is available, for a maximum of 5 seconds
- String url = m_baseUrl + SERVLET_ALIAS;
- m_logService.log(LogService.LOG_DEBUG, "Start waiting for url '" + url
+ "' to become available, timeout= " + TIMEOUT + "...");
+ // Wait until the test servlet is available, for a maximum of 5 seconds
+ String url = m_baseUrl + SERVLET_ALIAS;
+ m_logService.log(LogService.LOG_DEBUG, "Start waiting for url '" + url
+ "' to become available, timeout= " + TIMEOUT + "...");
if (!ConfigProvider.waitForURL(new URL(url), HttpStatus.SC_OK,
TIMEOUT)) {
// NB: Due to issue
https://issues.apache.org/jira/browse/FELIX-2714 it may happen that the
HttpService
// throws a connection refused, still listens to the default port
8080 or returns a 404. Therefore we
@@ -175,9 +176,9 @@
}
}
- // Wait for two seconds such that the Felix whiteboard service has the
time to receive the filter added
- // callback and register it. See
http://jira.amdatu.org/jira/browse/AMDATU-189
- Thread.sleep(2000);
+ // Wait for two seconds such that the Felix whiteboard service has the
time to receive the filter added
+ // callback and register it. See
http://jira.amdatu.org/jira/browse/AMDATU-189
+ Thread.sleep(2000);
// Our filter should be registered, use httpclient to do a GET
request. The filter should
// set some response header and we check if this header has been set
@@ -216,11 +217,11 @@
@Test
public void testJsp() throws Exception {
- initialize();
+ initialize();
// Wait until the JSP servlet is available, for a maximum of 5 seconds
- String url = m_baseUrl + "/" + RESOURCE_ID + "/jsp/test.jsp";
- m_logService.log(LogService.LOG_DEBUG, "Start waiting for url '" + url
+ "' to become available, timeout= " + TIMEOUT + "...");
+ String url = m_baseUrl + "/" + RESOURCE_ID + "/jsp/test.jsp";
+ m_logService.log(LogService.LOG_DEBUG, "Start waiting for url '" + url
+ "' to become available, timeout= " + TIMEOUT + "...");
if (!ConfigProvider.waitForURL(new URL(url), HttpStatus.SC_OK,
TIMEOUT)) {
// NB: Due to issue
https://issues.apache.org/jira/browse/FELIX-2714 it may happen that the
HttpService
// throws a connection refused, still listens to the default port
8080 or returns a 404. Therefore we
@@ -232,9 +233,9 @@
}
}
- // Wait for two seconds such that the Felix whiteboard service has the
time to receive the filter added
- // callback and register it. See
http://jira.amdatu.org/jira/browse/AMDATU-189
- Thread.sleep(2000);
+ // Wait for two seconds such that the Felix whiteboard service has the
time to receive the filter added
+ // callback and register it. See
http://jira.amdatu.org/jira/browse/AMDATU-189
+ Thread.sleep(2000);
// Our filter should be registered, use httpclient to do a GET
request. The filter should
// set some response header and we check if this header has been set
@@ -270,7 +271,7 @@
}
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException,
- ServletException {
+ ServletException {
((HttpServletResponse) res).setHeader(TEST_HEADER_BEFORE,
TEST_HEADER_BEFORE_VALUE);
chain.doFilter(req, res);
((HttpServletResponse) res).setHeader(TEST_HEADER_AFTER,
TEST_HEADER_AFTER_VALUE);
