Author: [email protected]
Date: Mon Jan 30 14:04:05 2012
New Revision: 2023
Log:
AMDATU-529 Refactor of web to updated Tenant interface (compile only)
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
trunk/amdatu-web/resource/src/main/java/org/amdatu/web/resource/service/ResourceProviderListener.java
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRegistrationServiceImpl.java
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/service/HostnameTenantResolverExtenderFilter.java
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/ParameterTenantResolverExtenderFilter.java
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
Mon Jan 30 14:04:05 2012
@@ -27,6 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import org.amdatu.core.tenant.Tenant;
+import org.amdatu.core.tenant.TenantConstants;
import org.amdatu.web.dispatcher.DispatchExtenderFilter;
import org.amdatu.web.dispatcher.DispatcherService;
import org.amdatu.web.dispatcher.context.HandlerServletContext;
@@ -144,7 +145,7 @@
getLogService().log(LogService.LOG_WARNING, "Cannot register a
filter without pattern");
return;
}
- String tenantId = getStringProperty(serviceReference,
Tenant.TENANT_ID_SERVICEPROPERTY);
+ String tenantId = getStringProperty(serviceReference,
TenantConstants.PID_KEY);
final FilterHandler filterHandler =
new FilterHandler(serviceId, contextId, filter, pattern,
serviceRanking, tenantId);
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
Mon Jan 30 14:04:05 2012
@@ -27,6 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import org.amdatu.core.tenant.Tenant;
+import org.amdatu.core.tenant.TenantConstants;
import org.amdatu.web.dispatcher.DispatcherService;
import org.amdatu.web.dispatcher.context.HandlerServletContext;
import org.amdatu.web.dispatcher.service.DispatcherServiceImpl;
@@ -121,7 +122,7 @@
return;
}
- String tenant = getStringProperty(serviceReference,
Tenant.TENANT_ID_SERVICEPROPERTY);
+ String tenant = getStringProperty(serviceReference,
TenantConstants.PID_KEY);
final ServletHandler handler =
new ServletHandler(serviceId, serviceRanking, contextId, servlet,
alias, tenant);
handler.setInitParams(getInitParams(serviceReference));
Modified:
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
==============================================================================
---
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
(original)
+++
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
Mon Jan 30 14:04:05 2012
@@ -15,14 +15,13 @@
*/
package org.amdatu.web.jsp.service;
-import static org.amdatu.core.tenant.Tenant.TENANT_ID_SERVICEPROPERTY;
-
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.Servlet;
+import org.amdatu.core.tenant.TenantConstants;
import org.amdatu.web.dispatcher.DispatcherService;
import org.amdatu.web.httpcontext.HttpContextManagerService;
import org.amdatu.web.httpcontext.ResourceProvider;
@@ -120,9 +119,9 @@
}
//AMDATU-479 - this is tricky
- final String tenantId = getStringProperty(serviceReference,
TENANT_ID_SERVICEPROPERTY);
+ final String tenantId = getStringProperty(serviceReference,
TenantConstants.PID_KEY);
if(tenantId != null)
- properties.put(TENANT_ID_SERVICEPROPERTY, tenantId);
+ properties.put(TenantConstants.PID_KEY, tenantId);
ResourceProviderJspServlet jspServlet = new
ResourceProviderJspServlet(jspBundle);
Component component = m_dependencyManager.createComponent()
Modified:
trunk/amdatu-web/resource/src/main/java/org/amdatu/web/resource/service/ResourceProviderListener.java
==============================================================================
---
trunk/amdatu-web/resource/src/main/java/org/amdatu/web/resource/service/ResourceProviderListener.java
(original)
+++
trunk/amdatu-web/resource/src/main/java/org/amdatu/web/resource/service/ResourceProviderListener.java
Mon Jan 30 14:04:05 2012
@@ -15,14 +15,13 @@
*/
package org.amdatu.web.resource.service;
-import static org.amdatu.core.tenant.Tenant.TENANT_ID_SERVICEPROPERTY;
-
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.Servlet;
+import org.amdatu.core.tenant.TenantConstants;
import org.amdatu.web.dispatcher.DispatcherService;
import org.amdatu.web.httpcontext.HttpContextManagerService;
import org.amdatu.web.httpcontext.ResourceProvider;
@@ -110,9 +109,9 @@
properties.put(HttpContextManagerService.CONTEXT_ID_KEY,
contextId);
//AMDATU-479 - this is tricky
- final String tenantId = getStringProperty(serviceReference,
TENANT_ID_SERVICEPROPERTY);
+ final String tenantId = getStringProperty(serviceReference,
TenantConstants.PID_KEY);
if(tenantId != null)
- properties.put(TENANT_ID_SERVICEPROPERTY, tenantId);
+ properties.put(TenantConstants.PID_KEY, tenantId);
Component servletComponent = m_dependencyManager.createComponent();
servletComponent.setInterface(Servlet.class.getName(), properties);
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
Mon Jan 30 14:04:05 2012
@@ -27,7 +27,7 @@
import javax.ws.rs.core.Variant.VariantListBuilder;
import javax.ws.rs.ext.RuntimeDelegate;
-import org.amdatu.core.tenant.Tenant;
+import org.amdatu.core.tenant.TenantConstants;
import org.amdatu.web.dispatcher.DispatcherService;
import org.amdatu.web.httpcontext.HttpContextManagerService;
import org.amdatu.web.rest.jaxrs.JaxRsSpi;
@@ -53,7 +53,8 @@
private volatile LogService m_logService;
// Map of registered REST service components
- private final ConcurrentHashMap<ServiceReference, Component>
m_servletComponents = new ConcurrentHashMap<ServiceReference, Component>();
+ private final ConcurrentHashMap<ServiceReference, Component>
m_servletComponents =
+ new ConcurrentHashMap<ServiceReference, Component>();
private Component m_spiComponent;
@@ -95,9 +96,9 @@
initParams.put(HttpContextManagerService.CONTEXT_ID_KEY,
contextId);
}
- String tenantId = getStringProperty(serviceReference,
Tenant.TENANT_ID_SERVICEPROPERTY);
+ String tenantId = getStringProperty(serviceReference,
TenantConstants.PID_KEY);
if (!tenantId.equals("")) {
- initParams.put(Tenant.TENANT_ID_SERVICEPROPERTY, tenantId);
+ initParams.put(TenantConstants.PID_KEY, tenantId);
}
WinkRestServlet restServlet = new WinkRestServlet(restPath, service,
tenantId);
@@ -106,7 +107,7 @@
.setInterface(Servlet.class.getName(), initParams)
.setImplementation(restServlet)
.setCallbacks("_init", "start", "stop", "_destroy");
-
+
// threadsafe
if (m_servletComponents.putIfAbsent(serviceReference,
servletComponent) == null) {
m_dependencyManager.add(servletComponent);
@@ -132,7 +133,8 @@
private void registerSpiService() {
Component comp = m_dependencyManager.createComponent()
.setInterface(JaxRsSpi.class.getName(), null)
- .setImplementation(new JaxRsSpi() {});
+ .setImplementation(new JaxRsSpi() {
+ });
m_dependencyManager.add(comp);
m_spiComponent = comp;
}
Modified:
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/service/HostnameTenantResolverExtenderFilter.java
==============================================================================
---
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/service/HostnameTenantResolverExtenderFilter.java
(original)
+++
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/service/HostnameTenantResolverExtenderFilter.java
Mon Jan 30 14:04:05 2012
@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletResponse;
import org.amdatu.core.tenant.Tenant;
+import org.amdatu.core.tenant.TenantConstants;
import org.amdatu.web.dispatcher.DispatchExtenderFilter;
import org.amdatu.web.dispatcher.DispatcherService;
import org.osgi.framework.BundleContext;
@@ -63,7 +64,7 @@
if (serverName != null) {
try {
ServiceReference[] refs =
-
m_bundleContext.getServiceReferences(Tenant.class.getName(), "(" +
Tenant.TENANT_SERVICEPROPERTY
+
m_bundleContext.getServiceReferences(Tenant.class.getName(), "(" +
TenantConstants.PID_KEY
+ "hostname=" + serverName + ")");
if (refs != null && refs.length > 0) {
Tenant tenant = (Tenant)
m_bundleContext.getService(refs[0]);
Modified:
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/ParameterTenantResolverExtenderFilter.java
==============================================================================
---
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/ParameterTenantResolverExtenderFilter.java
(original)
+++
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/ParameterTenantResolverExtenderFilter.java
Mon Jan 30 14:04:05 2012
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletRequest;
import org.amdatu.core.tenant.Tenant;
+import org.amdatu.core.tenant.TenantConstants;
import org.amdatu.web.dispatcher.DispatchExtenderFilter;
import org.amdatu.web.dispatcher.DispatcherService;
import org.osgi.framework.BundleContext;
@@ -64,7 +65,7 @@
if (tenantId != null) {
try {
ServiceReference[] refs =
-
m_bundleContext.getServiceReferences(Tenant.class.getName(), "(" +
Tenant.TENANT_ID_SERVICEPROPERTY
+
m_bundleContext.getServiceReferences(Tenant.class.getName(), "(" +
TenantConstants.PID_KEY
+ "=" + tenantId + ")");
if (refs != null && refs.length > 0) {
Tenant tenant = (Tenant)
m_bundleContext.getService(refs[0]);
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
