Author: [email protected]
Date: Tue Mar 29 18:36:20 2011
New Revision: 922
Log:
AMDATU-283 cleanup old resource/context code
Removed:
branches/AMDATU-283-dev/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/
branches/AMDATU-283-dev/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/context/HttpContextManager.java
Modified:
branches/AMDATU-283-dev/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/login/gadget/service/LoginGadgetImpl.java
branches/AMDATU-283-dev/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/service/LoginServiceImpl.java
branches/AMDATU-283-dev/amdatu-authorization/useradmin-gadget/src/main/java/org/amdatu/authorization/useradmin/gadget/service/UserAdminGadgetImpl.java
branches/AMDATU-283-dev/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/osgi/Activator.java
branches/AMDATU-283-dev/amdatu-example/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
branches/AMDATU-283-dev/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/CourseResource.java
branches/AMDATU-283-dev/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
branches/AMDATU-283-dev/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
branches/AMDATU-283-dev/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/AbstractHandlerRegistry.java
branches/AMDATU-283-dev/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/service/DispatcherServiceImpl.java
branches/AMDATU-283-dev/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/service/HttpContextManagerServiceImpl.java
branches/AMDATU-283-dev/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
Modified:
branches/AMDATU-283-dev/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/login/gadget/service/LoginGadgetImpl.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/login/gadget/service/LoginGadgetImpl.java
(original)
+++
branches/AMDATU-283-dev/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/login/gadget/service/LoginGadgetImpl.java
Tue Mar 29 18:36:20 2011
@@ -17,16 +17,13 @@
package org.amdatu.authorization.login.gadget.service;
import java.net.URL;
-import java.util.Dictionary;
import org.amdatu.authorization.login.gadget.osgi.Activator;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.opensocial.shindig.GadgetCategory;
import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
-import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.log.LogService;
/**
@@ -35,14 +32,12 @@
* @author ivol
*/
public class LoginGadgetImpl implements ResourceProvider {
+
// Service dependencies, injected by the Felix dependency manager
private volatile LogService m_logService;
private volatile BundleContext m_bundleContext;
private volatile GadgetManagement m_gadgetManagement;
- // The private HTTP context service for this bundle
- private Component m_httpContextComponent;
-
/**
* The init() method is invoked by the Felix dependency manager.
*/
@@ -59,12 +54,6 @@
m_logService.log(LogService.LOG_INFO, getClass().getName() + " service
started");
}
- // The destroy() method is automatically invoked by the Felix dependency
manager
- public void destroy() {
- // Stop the HTTP context service we created ourselves
- m_httpContextComponent.stop();
- }
-
public URL getResource(String name) {
final String pathPrefix = "/" + Activator.RESOURCE_ID + "/";
if(name != null && name.startsWith(pathPrefix)){
@@ -72,17 +61,4 @@
}
return null;
}
-
- public String getResourceId() {
- return Activator.RESOURCE_ID;
- }
-
- @SuppressWarnings("unchecked")
- private void checkAvailability(Dictionary dictionary, String[]
mandatoryKeys) throws ConfigurationException {
- for (String mandatoryKey : mandatoryKeys) {
- if (dictionary.get(mandatoryKey) == null) {
- throw new ConfigurationException("Missing configuration key",
mandatoryKey);
- }
- }
- }
}
Modified:
branches/AMDATU-283-dev/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/service/LoginServiceImpl.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/service/LoginServiceImpl.java
(original)
+++
branches/AMDATU-283-dev/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/service/LoginServiceImpl.java
Tue Mar 29 18:36:20 2011
@@ -16,7 +16,6 @@
*/
package org.amdatu.authorization.login.service.service;
-import java.net.URL;
import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -41,16 +40,13 @@
import org.amdatu.authentication.tokenprovider.TokenProvider;
import org.amdatu.authentication.tokenprovider.TokenProviderException;
import org.amdatu.authorization.login.service.LoginService;
-import org.amdatu.authorization.login.service.osgi.Activator;
import org.amdatu.core.tenant.Tenant;
import org.amdatu.core.tenant.TenantException;
import org.amdatu.core.tenant.TenantManagementService;
-import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.json.JSONException;
import org.json.JSONObject;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.service.log.LogService;
import org.osgi.service.useradmin.Group;
@@ -65,6 +61,7 @@
*/
@Path("authorization")
public class LoginServiceImpl implements LoginService {
+
// Default Administrator user credentials
private static final String DEFAULT_USERNAME = "Administrator";
private static final String DEFAULT_PASSWORD = "Administrator";
@@ -72,7 +69,6 @@
// Service dependencies, injected by the Felix dependency manager
private volatile LogService m_logService;
- private volatile BundleContext m_bundleContext;
private volatile UserAdmin m_userAdmin;
private volatile TokenProvider m_tokenProvider;
private volatile Component m_component;
@@ -80,10 +76,6 @@
private volatile TenantManagementService m_tenantManagementService;
private volatile Tenant m_tenant;
- // The private HTTP context service for this bundle
- private Component m_httpContextComponent;
-
-
// Disable HTTP caching in this REST interface
private static CacheControl m_cacheControl;
static {
@@ -130,12 +122,6 @@
}
}
- // The destroy() method is automatically invoked by the Felix
dependency manager
- public void destroy() {
- // Stop the HTTP context service we created ourselves
- m_httpContextComponent.stop();
- }
-
/**
* This method can be used to check the availability of the Login
Service.
*
Modified:
branches/AMDATU-283-dev/amdatu-authorization/useradmin-gadget/src/main/java/org/amdatu/authorization/useradmin/gadget/service/UserAdminGadgetImpl.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-authorization/useradmin-gadget/src/main/java/org/amdatu/authorization/useradmin/gadget/service/UserAdminGadgetImpl.java
(original)
+++
branches/AMDATU-283-dev/amdatu-authorization/useradmin-gadget/src/main/java/org/amdatu/authorization/useradmin/gadget/service/UserAdminGadgetImpl.java
Tue Mar 29 18:36:20 2011
@@ -23,23 +23,21 @@
import org.amdatu.opensocial.shindig.GadgetCategory;
import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
/**
* This service provides the UserAdmin gadget.
+ *
* @author ivol
*/
public class UserAdminGadgetImpl implements ResourceProvider {
+
// Service dependencies, injected by the Felix dependency manager
private volatile LogService m_logService;
private volatile BundleContext m_bundleContext;
private volatile GadgetManagement m_gadgetManagement;
- // The private HTTP context service for this bundle
- private Component m_httpContextComponent;
-
/**
* The init() method is invoked by the Felix dependency manager.
*/
@@ -56,21 +54,11 @@
m_logService.log(LogService.LOG_INFO, getClass().getName() + " service
started");
}
- // The destroy() method is automatically invoked by the Felix dependency
manager
- public void destroy() {
- // Stop the HTTP context service we created ourselves
- m_httpContextComponent.stop();
- }
-
public URL getResource(String name) {
final String pathPrefix = "/" + Activator.RESOURCE_ID + "/";
- if(name != null && name.startsWith(pathPrefix)){
- return
m_bundleContext.getBundle().getResource(name.substring(pathPrefix.length()));
+ if (name != null && name.startsWith(pathPrefix)) {
+ return
m_bundleContext.getBundle().getResource(name.substring(pathPrefix.length()));
}
return null;
}
-
- public String getResourceId() {
- return Activator.RESOURCE_ID;
- }
}
Modified:
branches/AMDATU-283-dev/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/osgi/Activator.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/osgi/Activator.java
(original)
+++
branches/AMDATU-283-dev/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/osgi/Activator.java
Tue Mar 29 18:36:20 2011
@@ -18,24 +18,18 @@
import org.amdatu.cassandra.application.CassandraDaemonService;
import org.amdatu.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.cassandra.useradminstore.rest.HttpContextRegistrationServiceImpl;
import
org.amdatu.cassandra.useradminstore.service.CassandraStorageProviderRegistrationServiceImpl;
import org.amdatu.cassandra.useradminstore.service.RoleColumnFamilyProvider;
import org.amdatu.core.tenant.Tenant;
-import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
-import org.osgi.service.http.HttpService;
import org.osgi.service.log.LogService;
/**
* This is the bundle activator for the UserAdmin bundle.
*/
public class Activator extends DependencyActivatorBase {
- // The resource identifier for this bundle. Resources are only considered
to be 'ours' when
- // it is prefixed with this id
- public final static String RESOURCE_ID = "useradmin";
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
@@ -51,12 +45,6 @@
.add(createServiceDependency().setService(CassandraDaemonService.class).setRequired(true))
.add(createServiceDependency().setService(LogService.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(HttpService.class).setRequired(true)));
}
@Override
Modified:
branches/AMDATU-283-dev/amdatu-example/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-example/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
(original)
+++
branches/AMDATU-283-dev/amdatu-example/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
Tue Mar 29 18:36:20 2011
@@ -45,7 +45,7 @@
Dictionary<String, Object> properties = new Hashtable<String,
Object>();
properties.put(DispatcherService.CONTEXT_ID_KEY, CONTEXTID);
- properties.put(DispatcherService.ALIAS_KEY, "/" + ALIAS);
+ properties.put(DispatcherService.ALIAS_KEY, ALIAS);
Component friendsgadgetService = createComponent()
.setInterface(ResourceProvider.class.getName(), properties)
Modified:
branches/AMDATU-283-dev/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/CourseResource.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/CourseResource.java
(original)
+++
branches/AMDATU-283-dev/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/CourseResource.java
Tue Mar 29 18:36:20 2011
@@ -39,7 +39,6 @@
import org.amdatu.example.course.service.osgi.Activator;
import org.amdatu.opensocial.profile.PersonService;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.apache.felix.dm.Component;
import org.apache.shindig.social.opensocial.model.Person;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -55,6 +54,7 @@
*/
@Path("course")
public class CourseResource implements ResourceProvider {
+
// Services injected by the Felix dependency manager
private volatile LogService m_logService;
private volatile BundleContext m_bundleContext;
@@ -65,7 +65,6 @@
// Instance variables
private List<String> m_cachedUrls = new ArrayList<String>();
- private Component m_httpContextComponent;
// HTTP caching policy for this REST interface
private static CacheControl m_cacheControl;
@@ -86,9 +85,6 @@
for (String url : m_cachedUrls) {
m_configTemplateManager.clear(url);
}
-
- // Stop the http context
- m_httpContextComponent.stop();
}
/**
Modified:
branches/AMDATU-283-dev/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
(original)
+++
branches/AMDATU-283-dev/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Tue Mar 29 18:36:20 2011
@@ -75,7 +75,6 @@
import org.apache.shindig.gadgets.variables.Substitutions;
import org.json.JSONException;
import org.json.JSONObject;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.service.log.LogService;
import org.osgi.service.useradmin.User;
@@ -95,10 +94,9 @@
private static final String[] GADGET_MODULEPREFS =
new String[] { "title", "description", "author", "author_email",
"author_affiliation", "screenshot",
- "title_url" };
+ "title_url" };
// Services injected by the Felix dependency manager
- private volatile BundleContext m_bundleContext;
private volatile LogService m_logService;
private volatile UserAdmin m_userAdmin;
private volatile GadgetStore m_gadgetStore;
@@ -106,8 +104,6 @@
private volatile TokenProvider m_tokenProvider;
private volatile DependencyManager m_dependencyManager;
- private Component m_httpContextComponent;
-
// Use the startId as prefix for the gadget id to ensure each gadget has a
unique id
private static int m_startId = 1;
@@ -133,12 +129,12 @@
*/
public void init() {
- // Create a service dependency on the token provider for 'our' tenant
+ // Create a service dependency on the token provider for 'our' tenant
String tenantId = (String)
m_component.getServiceProperties().get(Tenant.TENANT_ID_SERVICEPROPERTY);
- String tenantFilter = "(&(" + Tenant.TENANT_ID_SERVICEPROPERTY
+ "=" + tenantId + ")(" + Constants.OBJECTCLASS
- + "=" + TokenProvider.class.getName() + "))";
- m_component.add(m_dependencyManager.createServiceDependency()
- .setService(TokenProvider.class,
tenantFilter).setRequired(true).setInstanceBound(true));
+ String tenantFilter = "(&(" + Tenant.TENANT_ID_SERVICEPROPERTY + "=" +
tenantId + ")(" + Constants.OBJECTCLASS
+ + "=" + TokenProvider.class.getName() + "))";
+ m_component.add(m_dependencyManager.createServiceDependency()
+ .setService(TokenProvider.class,
tenantFilter).setRequired(true).setInstanceBound(true));
m_logService.log(LogService.LOG_INFO, getClass().getName() + " service
initialized");
}
@@ -153,16 +149,16 @@
* The destroy() method is invoked by the Felix dependency manager.
*/
public void destroy() {
- m_httpContextComponent.stop();
m_logService.log(LogService.LOG_INFO, getClass().getName() + " service
destroyed");
}
/**
* This method can be used to check the availability of the Gadget
management service.
+ *
* @return The text "Gadget management service online"
*/
@GET
- @Produces({MediaType.TEXT_PLAIN})
+ @Produces({ MediaType.TEXT_PLAIN })
public String status() {
return "Gadget management service online";
}
@@ -183,12 +179,12 @@
/**
* Returns gadgets available in the gadget store. URL to this resource:
* /rest/gadgetstore/categories
- *
+ *
* @return All available gadgets.
*/
@GET
@Path("categories")
- @Produces( { MediaType.APPLICATION_JSON })
+ @Produces({ MediaType.APPLICATION_JSON })
public Response getCategories(@Context HttpHeaders headers, @Context
HttpServletRequest request) {
JSONObject jsonObject = new JSONObject();
List<JSONObject> categories = new ArrayList<JSONObject>();
@@ -211,18 +207,19 @@
m_logService.log(LogService.LOG_ERROR, "An error occurred while
retrieving all categories", e);
}
- return Response.ok(jsonObject.toString(),
MediaType.APPLICATION_JSON_TYPE).cacheControl(m_maxAgeCacheControl).build();
+ return Response.ok(jsonObject.toString(),
MediaType.APPLICATION_JSON_TYPE).cacheControl(m_maxAgeCacheControl)
+ .build();
}
/**
* Returns gadgets available in the gadget store. URL to this resource:
* /rest/gadgetstore/gadgets/all
- *
+ *
* @return All available gadgets.
*/
@GET
@Path("gadgets/all")
- @Produces( { MediaType.APPLICATION_JSON })
+ @Produces({ MediaType.APPLICATION_JSON })
public Response getAllGadgets(@Context HttpHeaders headers, @Context
HttpServletRequest request,
@DefaultValue("") @QueryParam("category") final String categoryId) {
String errorMsg = "An error occurred while retrieving all gadgets for
category '" + categoryId + "'.";
@@ -269,19 +266,20 @@
catch (BlobCrypterException e) {
m_logService.log(LogService.LOG_ERROR, errorMsg, e);
}
- return Response.ok(jsonObject.toString(),
MediaType.APPLICATION_JSON_TYPE).cacheControl(m_noCacheControl).build();
+ return Response.ok(jsonObject.toString(),
MediaType.APPLICATION_JSON_TYPE).cacheControl(m_noCacheControl)
+ .build();
}
/**
* Returns gadgets registered for the current user. URL to this resource:
* /rest/gadgetstore/gadgets/mine
- *
+ *
* @return Gadgets registered for the current user.
*/
@SuppressWarnings("unchecked")
@GET
@Path("/gadgets/mine")
- @Produces( { MediaType.APPLICATION_JSON })
+ @Produces({ MediaType.APPLICATION_JSON })
public Response getMyGadgets(@Context HttpHeaders headers, @Context
HttpServletRequest request) {
JSONObject jsonObject = new JSONObject();
List<JSONObject> gadgets = new ArrayList<JSONObject>();
@@ -339,7 +337,8 @@
if (gadgetId.startsWith("http://";) ||
gadgetId.startsWith("https://";)) {
// Gadget id is not yet prefixed by the start id
gadget = retrieveGadget(request, gadgetId);
- } else {
+ }
+ else {
// Gadget id is prefixed by the start id
gadget = retrieveGadget(request,
gadgetId.substring(gadgetId.indexOf("-") + 1));
}
@@ -389,7 +388,8 @@
m_logService.log(LogService.LOG_ERROR, errorMsg, e);
}
- return Response.ok(jsonObject.toString(),
MediaType.APPLICATION_JSON_TYPE).cacheControl(m_noCacheControl).build();
+ return Response.ok(jsonObject.toString(),
MediaType.APPLICATION_JSON_TYPE).cacheControl(m_noCacheControl)
+ .build();
}
private void setGadgetId(JSONObject gadget, String gadgetId, boolean
generateStartId) throws JSONException {
@@ -446,7 +446,8 @@
gadgetSpec.put("screenshot",
spec.getModulePrefs().getScreenshot().toString());
}
else {
- gadgetSpec.put("screenshot", request.getContextPath() + "/" +
Activator.RESOURCE_ID + "/static/images/defaultgadget.png");
+ gadgetSpec.put("screenshot", request.getContextPath() + "/" +
Activator.RESOURCE_ID
+ + "/static/images/defaultgadget.png");
}
return gadgetSpec;
@@ -538,7 +539,7 @@
}
catch (IOException e) {
m_logService
- .log(LogService.LOG_ERROR, "Could not retrieve gadget XML from url
'" + url.toString() + "'", e);
+ .log(LogService.LOG_ERROR, "Could not retrieve gadget XML from
url '" + url.toString() + "'", e);
}
m_logService.log(LogService.LOG_DEBUG, "Retrieving gadgetspec '" + url
+ "' failed");
return null;
@@ -588,8 +589,9 @@
return resultLocale;
}
- private JSONObject retrieveGadget(HttpServletRequest request, String
gadgetUrl) throws JSONException, NoSuchAlgorithmException,
- UnsupportedEncodingException {
+ private JSONObject retrieveGadget(HttpServletRequest request, String
gadgetUrl) throws JSONException,
+ NoSuchAlgorithmException,
+ UnsupportedEncodingException {
Map<String, String> gadgetSpec = getGadgetSpec(request, gadgetUrl);
if (gadgetSpec != null) {
JSONObject gadget = new JSONObject();
@@ -604,7 +606,8 @@
// Set default screenshot when not defined in the gadget xml
if ("".equals(gadgetSpec.get("screenshot")) ||
gadgetSpec.get("screenshot") == null) {
- gadget.put("screenshot", request.getContextPath() + "/" +
Activator.RESOURCE_ID + "/static/images/defaultgadget.png");
+ gadget.put("screenshot", request.getContextPath() + "/" +
Activator.RESOURCE_ID
+ + "/static/images/defaultgadget.png");
}
// Set default author when not defined in the gadget xml
@@ -634,7 +637,7 @@
// Adds a security token
private void addSecurityToken(JSONObject gadget, HttpServletRequest
request)
- throws BlobCrypterException, JSONException {
+ throws BlobCrypterException, JSONException {
// TODO: This is the same key as in securitytokenkey.txt file of the
shindig application bundle
// But we are too lazy to load that key from the file
String key = "Tr9W5GNmfCb7eexNi0m+/HVgAlvsHmCuMEofHs6+LoU=";
Modified:
branches/AMDATU-283-dev/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
(original)
+++
branches/AMDATU-283-dev/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
Tue Mar 29 18:36:20 2011
@@ -48,7 +48,6 @@
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;
@@ -81,7 +80,6 @@
private volatile GuiceInjectorService m_guiceInjectorService;
// Other instance variables
- private HttpContext m_httpContext;
private List<Component> m_registeredServletComponents = new
ArrayList<Component>();
/**
Modified:
branches/AMDATU-283-dev/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/AbstractHandlerRegistry.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/AbstractHandlerRegistry.java
(original)
+++
branches/AMDATU-283-dev/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/AbstractHandlerRegistry.java
Tue Mar 29 18:36:20 2011
@@ -23,7 +23,6 @@
import javax.servlet.ServletContext;
import org.amdatu.web.dispatcher.context.DefaultHttpContext;
-import org.amdatu.web.dispatcher.context.HttpContextManager;
import org.amdatu.web.dispatcher.service.DispatcherServiceImpl;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
@@ -34,34 +33,35 @@
private LogService m_logService;
private ServletContext m_servletContext;
- private HttpContextManager m_httpContextManager;
- // handling httpcontext
+ // handling httpcontext
private final ConcurrentHashMap<String, HttpContext> m_httpContexts =
new ConcurrentHashMap<String, HttpContext>();
public void addHttpContext(String contextId, HttpContext context) {
HttpContext previousHttpContext =
m_httpContexts.putIfAbsent(contextId, context);
- if(previousHttpContext == null){
+ if (previousHttpContext == null) {
httpContextAdded(contextId, context);
- } else {
- //FIXME illegal state
+ }
+ else {
+ // FIXME illegal state
}
}
public abstract void httpContextAdded(String contextId, HttpContext
context);
-
+
public void removeHttpContext(String contextId) {
HttpContext previousHttpContext = m_httpContexts.remove(contextId);
- if(previousHttpContext != null){
- httpContextRemoved(contextId);
- } else {
- //FIXME illegal state
+ if (previousHttpContext != null) {
+ httpContextRemoved(contextId);
+ }
+ else {
+ // FIXME illegal state
}
}
public abstract void httpContextRemoved(String contextId);
-
+
public HttpContext getHttpContext(String contextId, Bundle bundle) {
if (contextId == null || contextId.equals("")) {
return new DefaultHttpContext(bundle);
@@ -70,8 +70,8 @@
return context;
}
- // handling httpcontext
-
+ // handling httpcontext
+
public AbstractHandlerRegistry() {
}
@@ -91,14 +91,6 @@
return m_servletContext;
}
- public void setHttpContextManager(HttpContextManager httpContextManager) {
- m_httpContextManager = httpContextManager;
- }
-
- public HttpContextManager getHttpContextManager() {
- return m_httpContextManager;
- }
-
protected String getStringProperty(ServiceReference ref, String key) {
Object value = ref.getProperty(key);
return (value instanceof String) ? (String) value : null;
@@ -134,16 +126,4 @@
protected HttpContext getHttpContext(String contextId) {
return m_httpContexts.get(contextId);
}
-
- protected HttpContext getHttpContext(ServiceReference serviceReference) {
- Bundle bundle = serviceReference.getBundle();
- String contextId = getStringProperty(serviceReference,
DispatcherServiceImpl.CONTEXT_ID_KEY);
- if (contextId != null) {
- HttpContext context =
m_httpContextManager.getHttpContext(contextId, bundle);
- if (context != null) {
- return context;
- }
- }
- return new DefaultHttpContext(bundle);
- }
}
Modified:
branches/AMDATU-283-dev/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/service/DispatcherServiceImpl.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/service/DispatcherServiceImpl.java
(original)
+++
branches/AMDATU-283-dev/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/service/DispatcherServiceImpl.java
Tue Mar 29 18:36:20 2011
@@ -30,7 +30,6 @@
import org.amdatu.web.dispatcher.DispatchExtenderFilter;
import org.amdatu.web.dispatcher.DispatcherService;
import org.amdatu.web.dispatcher.context.DefaultHttpContext;
-import org.amdatu.web.dispatcher.context.HttpContextManager;
import org.amdatu.web.dispatcher.dispatch.CustomFilterPipeline;
import org.amdatu.web.dispatcher.dispatch.ExtenderFilterPipeline;
import org.amdatu.web.dispatcher.filter.DispatchInterceptFilter;
@@ -49,7 +48,6 @@
private volatile ExtHttpService m_httpService;
private DispatchInterceptFilter m_interceptorFilter;
- private HttpContextManager m_httpContextManager;
private ServletHandlerRegistry m_servletHandlerRegistry;
private FilterHandlerRegistry m_filterHandlerRegistry;
private ServletContext m_extServletContext;
@@ -66,8 +64,6 @@
public void start() throws Exception {
- m_httpContextManager = new HttpContextManager();
-
m_interceptorFilter = new DispatchInterceptFilter();
m_interceptorFilter.setLogService(m_logService);
m_interceptorFilter.setDispatcherService(this);
@@ -79,12 +75,10 @@
m_servletHandlerRegistry = new ServletHandlerRegistry();
m_servletHandlerRegistry.setLogService(m_logService);
m_servletHandlerRegistry.setServletContext(m_extServletContext);
-
m_servletHandlerRegistry.setHttpContextManager(m_httpContextManager);
m_filterHandlerRegistry = new FilterHandlerRegistry();
m_filterHandlerRegistry.setLogService(m_logService);
m_filterHandlerRegistry.setServletContext(m_extServletContext);
-
m_filterHandlerRegistry.setHttpContextManager(m_httpContextManager);
}
catch (ServletException e) {
throw new Exception(DispatcherServiceImpl.class.getSimpleName() +
" failed to start", e);
@@ -97,7 +91,6 @@
m_servletHandlerRegistry = null;
m_filterHandlerRegistry = null;
- m_httpContextManager = null;
m_interceptorFilter.setDispatcherService(null);
m_interceptorFilter.setLogService(null);
@@ -140,7 +133,6 @@
HttpContext httpContext = (HttpContext) service;
String contextId = getStringProperty(serviceReference, CONTEXT_ID_KEY);
if (contextId != null) {
-// m_httpContextManager.addHttpContext(contextId, httpContext);
m_filterHandlerRegistry.addHttpContext(contextId, httpContext);
m_servletHandlerRegistry.addHttpContext(contextId, httpContext);
}
@@ -150,8 +142,6 @@
HttpContext httpContext = (HttpContext) service;
String contextId = getStringProperty(serviceReference, CONTEXT_ID_KEY);
if (contextId != null) {
- // check
-// m_httpContextManager.removeHttpContext(contextId);
m_filterHandlerRegistry.removeHttpContext(contextId);
m_servletHandlerRegistry.removeHttpContext(contextId);
}
@@ -171,10 +161,6 @@
return (value instanceof String) ? (String) value : null;
}
- public HttpContextManager getHttpContextManager() {
- return m_httpContextManager;
- }
-
public LogService getLogService() {
return m_logService;
}
Modified:
branches/AMDATU-283-dev/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/service/HttpContextManagerServiceImpl.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/service/HttpContextManagerServiceImpl.java
(original)
+++
branches/AMDATU-283-dev/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/service/HttpContextManagerServiceImpl.java
Tue Mar 29 18:36:20 2011
@@ -34,7 +34,7 @@
public class HttpContextManagerServiceImpl implements
HttpContextManagerService {
- private final static int LOG_LEVEL = LogService.LOG_ERROR;
+ private final static int LOG_LEVEL = LogService.LOG_DEBUG;
private final ConcurrentHashMap<String, ContextComponentTuple>
m_httpContextComponents =
new ConcurrentHashMap<String, ContextComponentTuple>();
Modified:
branches/AMDATU-283-dev/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
==============================================================================
---
branches/AMDATU-283-dev/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
(original)
+++
branches/AMDATU-283-dev/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
Tue Mar 29 18:36:20 2011
@@ -72,7 +72,6 @@
private volatile LogService m_logService;
private volatile ConfigurationAdmin m_configAdmin;
- private Component m_httpContextComponent;
private String m_baseUrl;
private TestServlet m_testServlet;
@@ -148,7 +147,6 @@
@After
public void tearDown() throws Exception {
- m_httpContextComponent.stop();
}
private void initialize() throws Exception {
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
